commit 802920d1bdb4b29a1737c00334d640bee126d8cf
author Andrew Walbran <qwandor@google.com> Wed Oct 18 18:51:20 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Oct 18 18:51:20 2023 +0000
tree 1e2e44f1cf8a8b35459c2aa75855d71fa508cbac
parent 2e73422393a09703488d4c261fc3964e264019ea
parent d7e7d52733fc299573b525033714d205354894e9

Migrate to cargo_embargo. am: 97e013e49b am: 63eb4811b7 am: d7e7d52733

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-task/+/2796115

Change-Id: I8efc3b2953632f3ae64204227e08cfae9a5656ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Android.bp

diff --git a/Android.bp b/Android.bp
index fa41b4f..9d860b0 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 {

cargo2android.json

diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index b98d10b..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.btservices",
-    "com.android.resolv",
-    "com.android.virt"
-  ],
-  "dependencies": true,
-  "device": true,
-  "min-sdk-version": "29",
-  "run": true,
-  "tests": true
-}

cargo_embargo.json

diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..f5493cb
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,11 @@
+{
+  "tests": true,
+  "apex_available": [
+    "//apex_available:platform",
+    "com.android.btservices",
+    "com.android.resolv",
+    "com.android.virt"
+  ],
+  "min_sdk_version": "29",
+  "run_cargo": false
+}