aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-09 17:00:37 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-09 17:00:37 +0000
commitfd2469754459dede5f8b1c9136fd7deca4b3a5c6 (patch)
tree953ebc827f9a18dd661b45b113d1ecc90feeca8e
parentccad4ed7d7ad4e8b59a847ae69bc2dca9d9c5c5a (diff)
parent954e6aba569a20a613c510f61bea6e7b8e185723 (diff)
downloadparking_lot-fd2469754459dede5f8b1c9136fd7deca4b3a5c6.tar.gz
Migrate to cargo_embargo. am: 954e6aba56
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/parking_lot/+/2824492 Change-Id: I0f9fb4f5fa57211c823d9249c0a23df95079dc8d 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, 4 insertions, 5 deletions
diff --git a/Android.bp b/Android.bp
index 6125816..73c14ee 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 f994fab..85d370f 100644
--- a/cargo2android.json
+++ b/cargo_embargo.json
@@ -1,10 +1,9 @@
{
- "apex-available": [
+ "apex_available": [
"//apex_available:platform",
"com.android.btservices",
"com.android.virt"
],
- "device": true,
- "min-sdk-version": "29",
- "run": true
+ "min_sdk_version": "29",
+ "run_cargo": false
}