Snap for 11147182 from 5db82bb93be90fc3a907cc0ecfdc35179c6f0afa to build-tools-release

Change-Id: I459d386780e9dec76448b6ad3fd3ec4b6ed8d8c7

3 files changed, 39 insertions, 17 deletions

diff --git a/Android.bp b/Android.bp
index bb8c469..4cd7d24 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --config cargo2android.json.
+// This file is generated by cargo_embargo.
 // Do not modify this file as changes will be overridden on upgrade.
 
 package {
@@ -785,4 +785,3 @@ rust_test {
         unit_test: true,
     },
 }
-
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 123896c..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "add-toplevel-block": "cargo2android_tests.bp",
-  "device": true,
-  "min-sdk-version": "29",
-  "run": true,
-  "variants": [
-    {
-      "features": "fs,io-util,macros,net,rt,rt-multi-thread,sync,time"
-    },
-    {
-      "features": "fs,io-util,macros,net,rt,rt-multi-thread,sync,test-util,time",
-      "suffix": "_for_test"
-    }
-  ]
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..c517398
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,38 @@
+{
+  "min_sdk_version": "29",
+  "package": {
+    "tokio": {
+      "add_toplevel_block": "cargo2android_tests.bp"
+    }
+  },
+  "variants": [
+    {
+      "features": [
+        "fs",
+        "io-util",
+        "macros",
+        "net",
+        "rt",
+        "rt-multi-thread",
+        "sync",
+        "time"
+      ]
+    },
+    {
+      "features": [
+        "fs",
+        "io-util",
+        "macros",
+        "net",
+        "rt",
+        "rt-multi-thread",
+        "sync",
+        "test-util",
+        "time"
+      ],
+      "module_name_overrides": {
+        "libtokio": "libtokio_for_test"
+      }
+    }
+  ]
+}