diff options
| author | Andrew Walbran <qwandor@google.com> | 2023-11-14 17:08:35 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-14 17:08:35 +0000 |
| commit | 0c145b7eaf04f5443ef2309e3795a2eba2ae7659 (patch) | |
| tree | fe871bf9bad6e29066b3123e78112f0fc60fe02e | |
| parent | 7f63d00a3e79c5278d782575cfd205c9acfcb045 (diff) | |
| parent | 1985d7e14e5b096cc517a6de20699b1293c25b84 (diff) | |
| download | lazy_static-0c145b7eaf04f5443ef2309e3795a2eba2ae7659.tar.gz | |
Migrate to cargo_embargo. am: 1985d7e14e
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/lazy_static/+/2828061
Change-Id: I6f0522835af3c832d6a57aac282b6692f64c286e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 10 | ||||
| -rw-r--r-- | cargo2android.json | 18 | ||||
| -rw-r--r-- | cargo_embargo.json | 14 |
3 files changed, 17 insertions, 25 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 { @@ -39,9 +39,8 @@ license { rust_test { name: "lazy_static_test_tests_test", - // has rustc warnings host_supported: true, - crate_name: "lazy_static", + crate_name: "test", cargo_env_compat: true, cargo_pkg_version: "1.4.0", srcs: ["tests/test.rs"], @@ -51,14 +50,11 @@ rust_test { unit_test: true, }, edition: "2015", - rustlibs: [ - "liblazy_static", - ], + rustlibs: ["liblazy_static"], } rust_library { name: "liblazy_static", - // has rustc warnings host_supported: true, crate_name: "lazy_static", cargo_env_compat: true, diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index b634ad1..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "apex-available": [ - "//apex_available:platform", - "//apex_available:anyapex" - ], - "dependency-blocklist": [ - "doc_comment" - ], - "device": true, - "min-sdk-version": "29", - "run": true, - "test-blocklist": [ - "tests/no_std.rs" - ], - "tests": true, - "vendor-available": true, - "product-available": true -} diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..8902785 --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,14 @@ +{ + "min_sdk_version": "29", + "module_blocklist": [ + "lazy_static_test_tests_no_std" + ], + "package": { + "lazy_static": { + "dep_blocklist": [ + "libdoc_comment" + ] + } + }, + "tests": true +} |