commit 2946fb6a1bb4ff81ded4297f837d5fb2b3560c56
author Andrew Walbran <qwandor@google.com> Fri Nov 10 17:38:47 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Nov 10 17:38:47 2023 +0000
tree d2570bf0aeefb6fe5a7142f367fec7d0a891b872
parent 2bd03a54b8a896755ebc8753e3608c4fbcd6f8c4
parent ff267a7f5f74a306daa4e9eb750dfea6f9d577a9

Migrate to cargo_embargo. am: ff267a7f5f

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

Change-Id: Icb32d559d8ba43cddbaf967c561438605d6902c2
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 b09a46d..2a725db 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 c6170fd..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "apex-available": [
-    "//apex_available:anyapex",
-    "//apex_available:platform"
-  ],
-  "dependencies": true,
-  "device": true,
-  "run": true,
-  "tests": true,
-  "product-available": true,
-  "vendor-available": true
-}

cargo_embargo.json

diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..5b612a5
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,8 @@
+{
+  "apex_available": [
+    "//apex_available:anyapex",
+    "//apex_available:platform"
+  ],
+  "run_cargo": false,
+  "tests": true
+}