Snap for 10453563 from 1a939194cba55c527a0bdf39ebb5b4720a437a04 to mainline-permission-release
Change-Id: Ie454c45e598c2756b179d05eaa25430d9f78998f
diff --git a/Android.bp b/Android.bp
index 7b32d6f..7ea5eee 100644
--- a/Android.bp
+++ b/Android.bp
@@ -94,10 +94,9 @@
],
apex_available: [
"//apex_available:platform",
- "com.android.compos",
- "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 6d13348..0f48374 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,25 +1,33 @@
// Generated by update_crate_tests.py for tests that depend on this crate.
{
+ "imports": [
+ {
+ "path": "packages/modules/Virtualization/authfs"
+ },
+ {
+ "path": "packages/modules/Virtualization/microdroid_manager"
+ },
+ {
+ "path": "packages/modules/Virtualization/virtualizationmanager"
+ },
+ {
+ "path": "packages/modules/Virtualization/vm"
+ },
+ {
+ "path": "system/keymint/hal"
+ },
+ {
+ "path": "system/security/diced"
+ },
+ {
+ "path": "system/security/keystore2"
+ },
+ {
+ "path": "system/security/keystore2/legacykeystore"
+ }
+ ],
"presubmit": [
{
- "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": "downcast-rs_test_src_lib"
},
{
@@ -27,52 +35,10 @@
},
{
"name": "downcast-rs_test_tests_use_via_namespace"
- },
- {
- "name": "keystore2_km_compat_test"
- },
- {
- "name": "keystore2_test"
- },
- {
- "name": "legacykeystore_test"
- },
- {
- "name": "libbinder_rs-internal_test"
- },
- {
- "name": "microdroid_manager_test"
- },
- {
- "name": "rustBinderTest"
- },
- {
- "name": "rustBinderTestService"
- },
- {
- "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": "downcast-rs_test_src_lib"
},
{
@@ -80,30 +46,6 @@
},
{
"name": "downcast-rs_test_tests_use_via_namespace"
- },
- {
- "name": "keystore2_km_compat_test"
- },
- {
- "name": "keystore2_test"
- },
- {
- "name": "legacykeystore_test"
- },
- {
- "name": "libbinder_rs-internal_test"
- },
- {
- "name": "microdroid_manager_test"
- },
- {
- "name": "rustBinderTest"
- },
- {
- "name": "rustBinderTestService"
- },
- {
- "name": "virtualizationservice_device_test"
}
]
}
diff --git a/cargo2android.json b/cargo2android.json
index d5077e9..7e748a8 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,14 +1,13 @@
{
"apex-available": [
"//apex_available:platform",
- "com.android.compos",
- "com.android.uwb",
- "com.android.virt"
+ "//apex_available:anyapex"
],
"dependencies": true,
"device": true,
"min-sdk-version": "29",
+ "product-available": true,
"run": true,
"tests": true,
"vendor-available": true
-}
\ No newline at end of file
+}
