commit 4347594c5e6d984d16f0c9f9b8e0f20ce638a316
author Andrew Walbran <qwandor@google.com> Wed Nov 15 20:31:43 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Nov 15 20:31:43 2023 +0000
tree e351dd4f83e1b4d4015bf825c853a871836e47dd
parent 37a9e1f4b134d9eff5c341099c2950ea7a5888b9
parent ef64a94361ef57c7e3db342b8438649bf34ca260

Migrate to cargo_embargo. am: ef64a94361

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/slab/+/2833050

Change-Id: I63fbf84bcd7700f62c5bc341f26b19f2cf9e7c69
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 0560e54..432e304 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..12fc32c
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,10 @@
+{
+  "apex_available": [
+    "//apex_available:platform",
+    "com.android.btservices",
+    "com.android.resolv",
+    "com.android.virt"
+  ],
+  "min_sdk_version": "29",
+  "tests": true
+}