aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-11-22 00:12:13 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-11-22 00:12:13 +0000
commit11988f7ee361575a0f01e55dace6bab4d0a3b6a6 (patch)
tree63826a262040215c448b7c753402751326f005f1
parent6c6d0ed0e073a841624aadf5007a97192f807750 (diff)
parent906d1a2cb902965a46ce54fce220a3d4da74172a (diff)
downloadstatic_assertions-11988f7ee361575a0f01e55dace6bab4d0a3b6a6.tar.gz
Snap for 11130662 from 906d1a2cb902965a46ce54fce220a3d4da74172a to sdk-release
Change-Id: I468eb0307acca845a3f4ac4b09acdc8a39176e11
-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
+}