diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-07 05:07:44 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-07 05:07:44 +0000 |
commit | 3c7fec0e10374c8048591bda81c0b66966af83ce (patch) | |
tree | ea0b6205a5b138249d63da8a5cf2c218703268b0 | |
parent | fd9ff2a7b7ac2895b6f3266cfbf500cf36c1cda1 (diff) | |
parent | 6e7f62e811f13487bdec87bbd22c071b5c7037f0 (diff) | |
download | minimal-lexical-3c7fec0e10374c8048591bda81c0b66966af83ce.tar.gz |
Snap for 10453563 from 6e7f62e811f13487bdec87bbd22c071b5c7037f0 to mainline-permission-releaseaml_per_341711000aml_per_341614000aml_per_341510010aml_per_341410020aml_per_341311000aml_per_341110020aml_per_341110010aml_per_341011100aml_per_341011020aml_per_340916010android14-mainline-permission-release
Change-Id: I2588736f66ca618e94971b4afec1c5bb4ca54cb6
-rw-r--r-- | Android.bp | 6 | ||||
-rw-r--r-- | TEST_MAPPING | 33 | ||||
-rw-r--r-- | cargo2android.json | 6 |
3 files changed, 17 insertions, 28 deletions
@@ -52,6 +52,12 @@ rust_library { "default", "std", ], + apex_available: [ + "//apex_available:platform", + "com.android.virt", + ], + product_available: true, + vendor_available: true, } rust_defaults { diff --git a/TEST_MAPPING b/TEST_MAPPING index 8b8f493..07bc9e6 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -9,24 +9,18 @@ }, { "path": "external/rust/crates/rusticata-macros" - } - ], - "presubmit": [ - { - "name": "keystore2_test" - }, - { - "name": "legacykeystore_test" }, { - "name": "libapkverify.integration_test" + "path": "packages/modules/Virtualization/virtualizationmanager" }, { - "name": "libapkverify.test" + "path": "system/security/keystore2" }, { - "name": "microdroid_manager_test" - }, + "path": "system/security/keystore2/legacykeystore" + } + ], + "presubmit": [ { "name": "minimal-lexical_test_tests_integration_tests" }, @@ -54,21 +48,6 @@ ], "presubmit-rust": [ { - "name": "keystore2_test" - }, - { - "name": "legacykeystore_test" - }, - { - "name": "libapkverify.integration_test" - }, - { - "name": "libapkverify.test" - }, - { - "name": "microdroid_manager_test" - }, - { "name": "minimal-lexical_test_tests_integration_tests" }, { diff --git a/cargo2android.json b/cargo2android.json index d36fb44..8e490de 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -1,5 +1,9 @@ { + "apex-available": [ + "//apex_available:platform", + "com.android.virt" + ], "device": true, "run": true, "tests": true -}
\ No newline at end of file +} |