aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-10-18 18:34:30 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-10-18 18:34:30 +0000
commit8f5a27a241b255e6cd86b17d6dc09c08dc64a983 (patch)
tree1bbacde180b0738f9cdbb7008eda5a0ce2a51601
parentdff4c19ddd65339a6e3d159076b47d51e42b18f3 (diff)
parent3e1c42f46940c251dc843db2c13ccf2b57d5da66 (diff)
downloadfnv-8f5a27a241b255e6cd86b17d6dc09c08dc64a983.tar.gz
Migrate to cargo_embargo. am: 3e1c42f469emu-34-3-release
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fnv/+/2796414 Change-Id: I0a322a1cc3fb6257e87f624364f93fe200b1ec0d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp2
-rw-r--r--cargo2android.json9
-rw-r--r--cargo_embargo.json8
3 files changed, 9 insertions, 10 deletions
diff --git a/Android.bp b/Android.bp
index 55237b0..a4ada52 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 {
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 6e516e0..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "apex-available": [
- "//apex_available:platform",
- "com.android.virt"
- ],
- "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..15db1a5
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,8 @@
+{
+ "tests": true,
+ "apex_available": [
+ "//apex_available:platform",
+ "com.android.virt"
+ ],
+ "run_cargo": false
+}