aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-16 18:56:30 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-16 18:56:30 +0000
commit30f307fab0b3763ec80e77a42bca27524811e9e2 (patch)
tree1a62f3c892f52d48293c08d31e135b8099686bb4
parent8cb6eb957755471af7becb4866b6cccf26580afe (diff)
parent3402470be840eb4ee7bbe55eeebd7e837103c298 (diff)
downloadrustc-demangle-30f307fab0b3763ec80e77a42bca27524811e9e2.tar.gz
Migrate to cargo_embargo. am: 090bdcef9c am: 96bdcdac9a am: 3402470be8
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rustc-demangle/+/2834453 Change-Id: I33587ffee0bc1489c474aec4d4716a2b86e142cb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp2
-rw-r--r--cargo2android.json18
-rw-r--r--cargo_embargo.json15
3 files changed, 16 insertions, 19 deletions
diff --git a/Android.bp b/Android.bp
index d7efeea..af83e04 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 a13f256..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "apex-available": [
- "//apex_available:platform",
- "com.android.runtime",
- "com.android.art.debug",
- "com.android.art"
- ],
- "device": true,
- "min-sdk-version": "S",
- "native-bridge-supported": true,
- "product-available": true,
- "ramdisk-available": true,
- "recovery-available": true,
- "run": true,
- "tests": true,
- "vendor-available": true,
- "vendor-ramdisk-available": true
-} \ No newline at end of file
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..f40467e
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,15 @@
+{
+ "apex_available": [
+ "//apex_available:platform",
+ "com.android.runtime",
+ "com.android.art.debug",
+ "com.android.art"
+ ],
+ "min_sdk_version": "S",
+ "native_bridge_supported": true,
+ "ramdisk_available": true,
+ "recovery_available": true,
+ "run_cargo": false,
+ "tests": true,
+ "vendor_ramdisk_available": true
+}