diff options
| -rw-r--r-- | Android.bp | 6 | ||||
| -rw-r--r-- | TEST_MAPPING | 153 | ||||
| -rw-r--r-- | cargo2android.json | 6 |
3 files changed, 17 insertions, 148 deletions
@@ -67,11 +67,7 @@ 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" ], vendor_available: true, min_sdk_version: "29", diff --git a/TEST_MAPPING b/TEST_MAPPING index 62ea866..e1d670f 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -5,19 +5,10 @@ "path": "external/rust/crates/base64" }, { - "path": "external/rust/crates/clap" + "path": "external/rust/crates/clap/2.33.3" }, { - "path": "external/rust/crates/crossbeam-deque" - }, - { - "path": "external/rust/crates/crossbeam-epoch" - }, - { - "path": "external/rust/crates/crossbeam-queue" - }, - { - "path": "external/rust/crates/crossbeam-utils" + "path": "external/rust/crates/hashbrown" }, { "path": "external/rust/crates/jni" @@ -51,160 +42,46 @@ }, { "path": "external/rust/crates/xml-rs" - } - ], - "presubmit": [ - { - "name": "VtsAidlDiceDemoteTargetTest" - }, - { - "name": "VtsAidlDiceTargetTest" - }, - { - "name": "ZipFuseTest" - }, - { - "name": "apkdmverity.test" - }, - { - "name": "authfs_device_test_src_lib" - }, - { - "name": "diced_open_dice_cbor_test" - }, - { - "name": "diced_sample_inputs_test" }, { - "name": "diced_test" + "path": "packages/modules/DnsResolver" }, { - "name": "diced_utils_test" + "path": "packages/modules/Virtualization/authfs" }, { - "name": "diced_vendor_test" + "path": "packages/modules/Virtualization/microdroid_manager" }, { - "name": "doh_unit_test" + "path": "packages/modules/Virtualization/virtualizationmanager" }, { - "name": "keystore2_client_tests" + "path": "packages/modules/Virtualization/vm" }, { - "name": "keystore2_km_compat_test" + "path": "system/keymint/hal" }, { - "name": "keystore2_legacy_blobs_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": "libidsig.test" - }, - { - "name": "microdroid_manager_test" - }, - { - "name": "virtualizationservice_device_test" } ], "presubmit-rust": [ { - "name": "VtsAidlDiceDemoteTargetTest" - }, - { - "name": "VtsAidlDiceTargetTest" - }, - { - "name": "ZipFuseTest" - }, - { - "name": "apkdmverity.test" - }, - { - "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_client_tests" - }, - { - "name": "keystore2_km_compat_test" - }, - { - "name": "keystore2_legacy_blobs_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": "libidsig.test" - }, - { - "name": "microdroid_manager_test" - }, - { - "name": "virtualizationservice_device_test" } ] } diff --git a/cargo2android.json b/cargo2android.json index c775247..2cb1e3d 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" |