aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-14 14:25:04 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-14 14:25:04 +0000
commitc9ad432b8f4a47c096b75937af194caed1652cb6 (patch)
tree83687b70a643322d8f35fa20916d348a64a19e57
parent4dc6beb6fed9bf92213163b9356630f463046472 (diff)
parentc33c0f82c517d010683ac74479f42fad92c3591f (diff)
downloadcrc32fast-c9ad432b8f4a47c096b75937af194caed1652cb6.tar.gz
Migrate to cargo_embargo. am: 0cc164a9e5 am: 0de2057494 am: c33c0f82c5
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/crc32fast/+/2828236 Change-Id: I887b169e9e38cf2a16ea231545f7f02dbe560786 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp6
-rw-r--r--cargo2android.json10
-rw-r--r--cargo_embargo.json7
3 files changed, 9 insertions, 14 deletions
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 @@ rust_library {
"std",
],
cfgs: ["crc32fast_stdarchx86"],
- rustlibs: [
- "libcfg_if",
- ],
+ rustlibs: ["libcfg_if"],
apex_available: [
"//apex_available:platform",
"com.android.virt",
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
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
+}