diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-07 04:44:11 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-07 04:44:11 +0000 |
commit | ceff8f620ed3ca6af5c776b18095c0924f884453 (patch) | |
tree | 4dfc76883699f2a738bd49a2ca1ce35a7643f9eb | |
parent | cc4850803005b395f1651220c5e351de525b9fdb (diff) | |
parent | b43d22ee9896ec1156c8320436d562dd37d44a43 (diff) | |
download | lazy_static-android14-mainline-appsearch-release.tar.gz |
Snap for 10453563 from b43d22ee9896ec1156c8320436d562dd37d44a43 to mainline-appsearch-releaseaml_ase_341510000aml_ase_341410000aml_ase_341310010aml_ase_341113000aml_ase_340913000android14-mainline-appsearch-release
Change-Id: Ice138612948df7db33c0536075ae91ab3b6da4dd
-rw-r--r-- | Android.bp | 7 | ||||
-rw-r--r-- | TEST_MAPPING | 141 | ||||
-rw-r--r-- | cargo2android.json | 9 |
3 files changed, 20 insertions, 137 deletions
@@ -67,12 +67,9 @@ rust_library { edition: "2015", apex_available: [ "//apex_available:platform", - "com.android.bluetooth", - "com.android.compos", - "com.android.resolv", - "com.android.uwb", - "com.android.virt", + "//apex_available:anyapex", ], + product_available: true, vendor_available: true, min_sdk_version: "29", } diff --git a/TEST_MAPPING b/TEST_MAPPING index b9ed59b..e1d670f 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -2,22 +2,13 @@ { "imports": [ { - "path": "external/rust/crates/android_logger" - }, - { "path": "external/rust/crates/base64" }, { - "path": "external/rust/crates/crossbeam-deque" - }, - { - "path": "external/rust/crates/crossbeam-epoch" - }, - { - "path": "external/rust/crates/crossbeam-queue" + "path": "external/rust/crates/clap/2.33.3" }, { - "path": "external/rust/crates/crossbeam-utils" + "path": "external/rust/crates/hashbrown" }, { "path": "external/rust/crates/jni" @@ -51,148 +42,46 @@ }, { "path": "external/rust/crates/xml-rs" - } - ], - "presubmit": [ - { - "name": "authfs_device_test_src_lib" }, { - "name": "diced_open_dice_cbor_test" + "path": "packages/modules/DnsResolver" }, { - "name": "diced_sample_inputs_test" + "path": "packages/modules/Virtualization/authfs" }, { - "name": "diced_test" + "path": "packages/modules/Virtualization/microdroid_manager" }, { - "name": "diced_utils_test" + "path": "packages/modules/Virtualization/virtualizationmanager" }, { - "name": "diced_vendor_test" + "path": "packages/modules/Virtualization/vm" }, { - "name": "doh_unit_test" + "path": "system/keymint/hal" }, { - "name": "keystore2_km_compat_test" + "path": "system/security/diced" }, { - "name": "keystore2_selinux_concurrency_test" + "path": "system/security/keystore2" }, { - "name": "keystore2_selinux_test" + "path": "system/security/keystore2/legacykeystore" }, { - "name": "keystore2_test" - }, - { - "name": "keystore2_test_utils_test" - }, + "path": "system/security/keystore2/selinux" + } + ], + "presubmit": [ { "name": "lazy_static_test_tests_test" - }, - { - "name": "legacykeystore_test" - }, - { - "name": "libapkverify.integration_test" - }, - { - "name": "libapkverify.test" - }, - { - "name": "logger_device_unit_tests" - }, - { - "name": "logger_test_config_log_level" - }, - { - "name": "logger_test_default_init" - }, - { - "name": "logger_test_env_log_level" - }, - { - "name": "logger_test_multiple_init" - }, - { - "name": "microdroid_manager_test" - }, - { - "name": "virtualizationservice_device_test" } ], "presubmit-rust": [ { - "name": "authfs_device_test_src_lib" - }, - { - "name": "diced_open_dice_cbor_test" - }, - { - "name": "diced_sample_inputs_test" - }, - { - "name": "diced_test" - }, - { - "name": "diced_utils_test" - }, - { - "name": "diced_vendor_test" - }, - { - "name": "doh_unit_test" - }, - { - "name": "keystore2_km_compat_test" - }, - { - "name": "keystore2_selinux_concurrency_test" - }, - { - "name": "keystore2_selinux_test" - }, - { - "name": "keystore2_test" - }, - { - "name": "keystore2_test_utils_test" - }, - { "name": "lazy_static_test_tests_test" - }, - { - "name": "legacykeystore_test" - }, - { - "name": "libapkverify.integration_test" - }, - { - "name": "libapkverify.test" - }, - { - "name": "logger_device_unit_tests" - }, - { - "name": "logger_test_config_log_level" - }, - { - "name": "logger_test_default_init" - }, - { - "name": "logger_test_env_log_level" - }, - { - "name": "logger_test_multiple_init" - }, - { - "name": "microdroid_manager_test" - }, - { - "name": "virtualizationservice_device_test" } ] } diff --git a/cargo2android.json b/cargo2android.json index c775247..b634ad1 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -1,11 +1,7 @@ { "apex-available": [ "//apex_available:platform", - "com.android.bluetooth", - "com.android.compos", - "com.android.resolv", - "com.android.uwb", - "com.android.virt" + "//apex_available:anyapex" ], "dependency-blocklist": [ "doc_comment" @@ -17,5 +13,6 @@ "tests/no_std.rs" ], "tests": true, - "vendor-available": true + "vendor-available": true, + "product-available": true } |