aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-10 19:02:15 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-10 19:02:15 +0000
commit38881520ccc01d83d2f41285fed793493efebe27 (patch)
treed2570bf0aeefb6fe5a7142f367fec7d0a891b872
parent2bd03a54b8a896755ebc8753e3608c4fbcd6f8c4 (diff)
parent2946fb6a1bb4ff81ded4297f837d5fb2b3560c56 (diff)
downloadregex-38881520ccc01d83d2f41285fed793493efebe27.tar.gz
Migrate to cargo_embargo. am: ff267a7f5f am: 2946fb6a1b
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/regex/+/2824496 Change-Id: Iaa02b54673621f75ebb69a111dc8736a765b2e49 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp2
-rw-r--r--cargo2android.json12
-rw-r--r--cargo_embargo.json8
3 files changed, 9 insertions, 13 deletions
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 {
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
-}
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
+}