aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-15 20:32:33 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-15 20:32:33 +0000
commit83a5ae1063c80a68fd891b93bf9caae497254eaa (patch)
treee351dd4f83e1b4d4015bf825c853a871836e47dd
parentb4d6ef52b3455146bc03e8291ce4859cc1ec8d42 (diff)
parentef64a94361ef57c7e3db342b8438649bf34ca260 (diff)
downloadslab-83a5ae1063c80a68fd891b93bf9caae497254eaa.tar.gz
Migrate to cargo_embargo. am: ef64a94361
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/slab/+/2833050 Change-Id: I3ceed3afa3c05d2acf65ec99cae684b3bdb168c6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp2
-rw-r--r--cargo_embargo.json (renamed from cargo2android.json)7
2 files changed, 3 insertions, 6 deletions
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 {
diff --git a/cargo2android.json b/cargo_embargo.json
index b98d10b..12fc32c 100644
--- a/cargo2android.json
+++ b/cargo_embargo.json
@@ -1,13 +1,10 @@
{
- "apex-available": [
+ "apex_available": [
"//apex_available:platform",
"com.android.btservices",
"com.android.resolv",
"com.android.virt"
],
- "dependencies": true,
- "device": true,
- "min-sdk-version": "29",
- "run": true,
+ "min_sdk_version": "29",
"tests": true
}