diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-11-09 16:49:42 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-11-09 16:49:42 +0000 |
| commit | eb649ad40915bbcf603c39d7e6b7086ed8194fe5 (patch) | |
| tree | 6fd0933836e046c02baf5e20315dfc9914eb716e | |
| parent | 105489b0a9d13d291ed31d88d136c445d50c46ee (diff) | |
| parent | d2ac4836d586e8b6c17a1e57d0619cf7911cf7e7 (diff) | |
| download | lazy_static-eb649ad40915bbcf603c39d7e6b7086ed8194fe5.tar.gz | |
Add apex_available. am: 59af4e0f57 am: 94acc62bf6 am: 286ead10c6 am: d8885ca469 am: d2ac4836d5
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/lazy_static/+/1880150
Change-Id: Ib458c0ae8d909e71c9515c0027f346014452bcad
| -rw-r--r-- | Android.bp | 38 | ||||
| -rw-r--r-- | cargo2android.json | 1 |
2 files changed, 10 insertions, 29 deletions
@@ -38,31 +38,12 @@ license { } rust_defaults { - name: "lazy_static_defaults", + name: "lazy_static_test_defaults", crate_name: "lazy_static", // has rustc warnings - srcs: ["src/lib.rs"], - test_suites: ["general-tests"], - auto_gen_config: true, - edition: "2015", -} - -rust_test_host { - name: "lazy_static_host_test_src_lib", - defaults: ["lazy_static_defaults"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "lazy_static_device_test_src_lib", - defaults: ["lazy_static_defaults"], -} - -rust_defaults { - name: "lazy_static_defaults_lazy_static", - crate_name: "lazy_static", + srcs: ["tests/test.rs"], + cargo_env_compat: true, + cargo_pkg_version: "1.4.0", test_suites: ["general-tests"], auto_gen_config: true, edition: "2015", @@ -73,9 +54,7 @@ rust_defaults { rust_test_host { name: "lazy_static_host_test_tests_test", - defaults: ["lazy_static_defaults_lazy_static"], - // has rustc warnings - srcs: ["tests/test.rs"], + defaults: ["lazy_static_test_defaults"], test_options: { unit_test: true, }, @@ -83,9 +62,7 @@ rust_test_host { rust_test { name: "lazy_static_device_test_tests_test", - defaults: ["lazy_static_defaults_lazy_static"], - // has rustc warnings - srcs: ["tests/test.rs"], + defaults: ["lazy_static_test_defaults"], } rust_library { @@ -93,12 +70,15 @@ rust_library { // has rustc warnings host_supported: true, crate_name: "lazy_static", + cargo_env_compat: true, + cargo_pkg_version: "1.4.0", srcs: ["src/lib.rs"], edition: "2015", apex_available: [ "//apex_available:platform", "com.android.compos", "com.android.resolv", + "com.android.uwb", "com.android.virt", ], min_sdk_version: "29", diff --git a/cargo2android.json b/cargo2android.json index def22c4..091119e 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -3,6 +3,7 @@ "//apex_available:platform", "com.android.compos", "com.android.resolv", + "com.android.uwb", "com.android.virt" ], "dependency-blocklist": [ |