diff options
| author | Jeff Vander Stoep <jeffv@google.com> | 2021-04-14 13:57:08 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-14 13:57:08 +0000 |
| commit | 949a3d6dcfeb1eeb4c1f49484f1377452e896d29 (patch) | |
| tree | 76980c2e362d958a22e122f6ed5a4cdc4156796a | |
| parent | f731745e5bc397e204005d84271c4fd05f34f67a (diff) | |
| parent | d8a736d575cc23ac823656988229e89e143ec2a0 (diff) | |
| download | lazy_static-949a3d6dcfeb1eeb4c1f49484f1377452e896d29.tar.gz | |
Delete lazy_static_device_test_tests_no_std am: d8a736d575
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/lazy_static/+/1671587
Change-Id: I6c5dbb545f3b47ec5b5ebc578db03d34bb91e4da
| -rw-r--r-- | Android.bp | 22 | ||||
| -rw-r--r-- | TEST_MAPPING | 3 | ||||
| -rw-r--r-- | patches/Android.bp.diff | 44 |
3 files changed, 26 insertions, 43 deletions
@@ -1,4 +1,5 @@ -// This file is generated by cargo2android.py --run --device --dependencies --tests --patch=patches/Android.bp.diff. +// This file is generated by cargo2android.py --run --device --tests --patch=patches/Android.bp.diff. +// Do not modify this file as changes will be overridden on upgrade. package { default_applicable_licenses: ["external_rust_crates_lazy_static_license"], @@ -71,23 +72,6 @@ rust_defaults { } rust_test_host { - name: "lazy_static_host_test_tests_no_std", - defaults: ["lazy_static_defaults_lazy_static"], - // has rustc warnings - srcs: ["tests/no_std.rs"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "lazy_static_device_test_tests_no_std", - defaults: ["lazy_static_defaults_lazy_static"], - // has rustc warnings - srcs: ["tests/no_std.rs"], -} - -rust_test_host { name: "lazy_static_host_test_tests_test", defaults: ["lazy_static_defaults_lazy_static"], // has rustc warnings @@ -118,5 +102,3 @@ rust_library { ], min_sdk_version: "29", } - -// dependent_library ["feature_list"] diff --git a/TEST_MAPPING b/TEST_MAPPING index 1842f5d..c17c99e 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -11,9 +11,6 @@ "name": "libsqlite3-sys_device_test_src_lib" }, { - "name": "lazy_static_device_test_tests_no_std" - }, - { "name": "android_logger_device_test_src_lib" }, { diff --git a/patches/Android.bp.diff b/patches/Android.bp.diff index 3406a8e..213237d 100644 --- a/patches/Android.bp.diff +++ b/patches/Android.bp.diff @@ -1,35 +1,39 @@ diff --git a/Android.bp b/Android.bp -index 937918e..ead8044 100644 +index 5033c27..843fa1c 100644 --- a/Android.bp +++ b/Android.bp -@@ -8,9 +8,6 @@ rust_defaults { - test_suites: ["general-tests"], - auto_gen_config: true, - edition: "2015", -- rustlibs: [ -- "libdoc_comment", -- ], +@@ -71,23 +71,6 @@ rust_defaults { + ], } +-rust_test_host { +- name: "lazy_static_host_test_tests_no_std", +- defaults: ["lazy_static_defaults_lazy_static"], +- // has rustc warnings +- srcs: ["tests/no_std.rs"], +- test_options: { +- unit_test: true, +- }, +-} +- +-rust_test { +- name: "lazy_static_device_test_tests_no_std", +- defaults: ["lazy_static_defaults_lazy_static"], +- // has rustc warnings +- srcs: ["tests/no_std.rs"], +-} +- rust_test_host { -@@ -33,7 +30,6 @@ rust_defaults { - auto_gen_config: true, - edition: "2015", - rustlibs: [ -- "libdoc_comment", - "liblazy_static", - ], - } -@@ -79,7 +75,11 @@ rust_library { + name: "lazy_static_host_test_tests_test", + defaults: ["lazy_static_defaults_lazy_static"], +@@ -112,4 +95,9 @@ rust_library { crate_name: "lazy_static", srcs: ["src/lib.rs"], edition: "2015", + apex_available: [ + "//apex_available:platform", + "com.android.resolv", ++ "com.android.virt", + ], + min_sdk_version: "29", } - - // dependent_library ["feature_list"] --// doc-comment-0.3.3 |