commit 8afa3b35b0659a737ea8cab619273c872dfc072e
author Andrew Walbran <qwandor@google.com> Tue Nov 14 13:19:30 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Nov 14 13:19:30 2023 +0000
tree 83687b70a643322d8f35fa20916d348a64a19e57
parent 1d3fc6482b43ee453fc036e410fcc60db3436696
parent 0cc164a9e59289350a4b8b3ab1b1a7c1917dddb3

Migrate to cargo_embargo. am: 0cc164a9e5

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

Change-Id: I1c63cac9f31d6e8293c805b32504f83769056515
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 9e1ffe5..798ba82 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 {
@@ -76,9 +76,7 @@
         "std",
     ],
     cfgs: ["crc32fast_stdarchx86"],
-    rustlibs: [
-        "libcfg_if",
-    ],
+    rustlibs: ["libcfg_if"],
     apex_available: [
         "//apex_available:platform",
         "com.android.virt",

cargo2android.json

diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index ac56e26..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.virt"
-  ],
-  "dependencies": true,
-  "device": true,
-  "run": true,
-  "tests": true
-}
\ No newline at end of file

cargo_embargo.json

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