aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-13 23:48:13 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-13 23:48:13 +0000
commita35c0263fba6c0ecc7c80f53af15f30d51f1ee0d (patch)
tree85bba2898c7ba5b053d723b80a04dee78593f109
parentadb2f137e637768093c0d0ce79ba2919e028c288 (diff)
parent3654b9002a519181e6fb927c0be7e21028af359b (diff)
downloadsmallvec-a35c0263fba6c0ecc7c80f53af15f30d51f1ee0d.tar.gz
Migrate to cargo_embargo. am: ce649db309 am: 5d9d02fb0f am: 3654b9002a
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/smallvec/+/2828211 Change-Id: I91981db19b4f51eed421ab132e9abea156e96be5 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)8
2 files changed, 4 insertions, 6 deletions
diff --git a/Android.bp b/Android.bp
index a64911f..4211203 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 7b27fc0..76e999c 100644
--- a/cargo2android.json
+++ b/cargo_embargo.json
@@ -1,12 +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",
+ "run_cargo": false
}