diff options
| author | Andrew Walbran <qwandor@google.com> | 2023-11-16 18:57:50 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-16 18:57:50 +0000 |
| commit | ab6225494dd8422dab1dac42242fbce019abd246 (patch) | |
| tree | 63826a262040215c448b7c753402751326f005f1 | |
| parent | d9bfd4ecf17ab7ddfa78d3873461801a861c367e (diff) | |
| parent | c2509a3814b2a741455d5945fb7f82113dd8ae7d (diff) | |
| download | static_assertions-ab6225494dd8422dab1dac42242fbce019abd246.tar.gz | |
Migrate to cargo_embargo. am: 906d1a2cb9 am: c2509a3814
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/static_assertions/+/2832578
Change-Id: I061e15987eb5383af3a1a6e7be081ea8dad96d3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 3 | ||||
| -rw-r--r-- | cargo2android.json | 7 | ||||
| -rw-r--r-- | cargo_embargo.json | 5 |
3 files changed, 7 insertions, 8 deletions
@@ -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 +} |