commit c721a17fb0334d04c7de85c01e88607f3e8b029f
author Andrew Walbran <qwandor@google.com> Thu Nov 09 20:51:22 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Nov 09 20:51:22 2023 +0000
tree 953ebc827f9a18dd661b45b113d1ecc90feeca8e
parent 648b23ed8027b200a39eb79f1b576cf2784f3007
parent a659eefbad6c81a9138131fa3201a542b9d041c1

Migrate to cargo_embargo. am: 954e6aba56 am: fd24697544 am: a659eefbad

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

Change-Id: I97b1fb9ab5fa34031f921095b2ad7f2001f07683
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 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 {

cargo2android.json

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

cargo_embargo.json

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