summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-17 00:47:45 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-17 00:47:45 +0000
commit78b4caf327e1725758fdaef9b61d889808503313 (patch)
treebb5a26fbf405fbcf9ef20555d94463615e69e191
parenteecfc6df8cb9b866c5cf088cf71aaa9ebb12b29c (diff)
parent34065597a2ad0a756a47f7232c1403b64bbebcf8 (diff)
downloadrustc-demangle-capi-78b4caf327e1725758fdaef9b61d889808503313.tar.gz
Migrate to cargo_embargo. am: 34065597a2
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rustc-demangle-capi/+/2832426 Change-Id: I7547400815b341e56cfb44dba3896f458267b858 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp15
-rw-r--r--cargo2android.json21
-rw-r--r--cargo_embargo.json22
3 files changed, 26 insertions, 32 deletions
diff --git a/Android.bp b/Android.bp
index 57a3add..4c570c0 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 {
@@ -41,19 +41,14 @@ license {
rust_ffi_static {
name: "librustc_demangle_static",
- stem: "librustc_demangle",
host_supported: true,
crate_name: "rustc_demangle",
cargo_env_compat: true,
cargo_pkg_version: "0.1.0",
srcs: ["src/lib.rs"],
edition: "2015",
- rustlibs: [
- "librustc_demangle",
- ],
- include_dirs: [
- "include",
- ],
+ rustlibs: ["librustc_demangle"],
+ include_dirs: ["include"],
apex_available: [
"//apex_available:platform",
"com.android.runtime",
@@ -82,7 +77,5 @@ rust_test {
unit_test: true,
},
edition: "2015",
- rustlibs: [
- "librustc_demangle",
- ],
+ rustlibs: ["librustc_demangle"],
}
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 8837179..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "apex-available": [
- "//apex_available:platform",
- "com.android.runtime",
- "com.android.art.debug",
- "com.android.art"
- ],
- "device": true,
- "exported-c-header-dir": [
- "include"
- ],
- "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..d0b22e8
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,22 @@
+{
+ "apex_available": [
+ "//apex_available:platform",
+ "com.android.runtime",
+ "com.android.art.debug",
+ "com.android.art"
+ ],
+ "min_sdk_version": "S",
+ "native_bridge_supported": true,
+ "package": {
+ "rustc-demangle-capi": {
+ "exported_c_header_dir": [
+ "include"
+ ]
+ }
+ },
+ "ramdisk_available": true,
+ "recovery_available": true,
+ "run_cargo": false,
+ "tests": true,
+ "vendor_ramdisk_available": true
+}