commit ca53f258b4488e796e1bc25297dac5edc339b03b
author Andrew Walbran <qwandor@google.com> Wed Oct 18 18:33:17 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Oct 18 18:33:17 2023 +0000
tree 409bfabab642248d521db866bb4974ebc5c231e5
parent a980d4626afc5c31f0a78818562df213e1d5a485
parent 54100691661ac74fa965fa469bb7c607b7164607

Migrate to cargo_embargo. am: 5410069166

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/aho-corasick/+/2769499

Change-Id: I914cd521a8f7984bb784abcaf50840c5d4bce50c
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 ced92eb..f170196 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 {
@@ -55,9 +55,7 @@
         "default",
         "std",
     ],
-    rustlibs: [
-        "libmemchr",
-    ],
+    rustlibs: ["libmemchr"],
 }
 
 rust_library {
@@ -72,9 +70,7 @@
         "default",
         "std",
     ],
-    rustlibs: [
-        "libmemchr",
-    ],
+    rustlibs: ["libmemchr"],
     apex_available: [
         "//apex_available:platform",
         "com.android.compos",

cargo2android.json

diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index bef74ca..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.compos",
-    "com.android.virt"
-  ],
-  "dependencies": true,
-  "device": true,
-  "run": true,
-  "tests": true,
-  "vendor-available": true
-}

cargo_embargo.json

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