aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-16 18:11:04 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-16 18:11:04 +0000
commit16047f5b2700645e920c4d763e90d0315c884482 (patch)
tree63826a262040215c448b7c753402751326f005f1
parent9438d068292c718ed63fa2c30ba3e0bbae2a9583 (diff)
parent906d1a2cb902965a46ce54fce220a3d4da74172a (diff)
downloadstatic_assertions-16047f5b2700645e920c4d763e90d0315c884482.tar.gz
Migrate to cargo_embargo. am: 906d1a2cb9
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/static_assertions/+/2832578 Change-Id: Ib02387ac3deabe8f8aa80408a1abb397d1949137 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp3
-rw-r--r--cargo2android.json7
-rw-r--r--cargo_embargo.json5
3 files changed, 7 insertions, 8 deletions
diff --git a/Android.bp b/Android.bp
index 1d545f3..b5d0cf5 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 {
@@ -25,6 +25,7 @@ rust_library {
host_supported: true,
crate_name: "static_assertions",
cargo_env_compat: true,
+ cargo_pkg_version: "1.1.0",
srcs: ["src/lib.rs"],
edition: "2015",
apex_available: [
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index ac5389c..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "device": true,
- "no_pkg_vers": true,
- "min-sdk-version": "29",
- "vendor-available": true,
- "run": true
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..18570ca
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,5 @@
+{
+ "min_sdk_version": "29",
+ "module_blocklist": ["libproc_static_assertions"],
+ "run_cargo": false
+}