Snap for 10453563 from 5ac15724c0d4a1ea2ed7e6b0da0af120e0070f7c to mainline-ipsec-release
Change-Id: I8d55c47ecf75cec98864c47defe2d3f72db99749
diff --git a/Android.bp b/Android.bp
index 554acac..5614204 100644
--- a/Android.bp
+++ b/Android.bp
@@ -54,6 +54,11 @@
"libhalf",
"libserde",
],
+ apex_available: [
+ "//apex_available:platform",
+ "//apex_available:anyapex",
+ ],
+ product_available: true,
vendor_available: true,
}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index e3e6542..a757518 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -12,28 +12,25 @@
},
{
"path": "external/rust/crates/unicode-xid"
+ },
+ {
+ "path": "packages/modules/Virtualization/avmd"
+ },
+ {
+ "path": "packages/modules/Virtualization/microdroid_manager"
+ },
+ {
+ "path": "system/security/diced"
+ },
+ {
+ "path": "system/security/keystore2"
+ },
+ {
+ "path": "system/security/keystore2/legacykeystore"
}
],
"presubmit": [
{
- "name": "diced_test"
- },
- {
- "name": "diced_vendor_test"
- },
- {
- "name": "keystore2_test"
- },
- {
- "name": "keystore2_test_utils_test"
- },
- {
- "name": "legacykeystore_test"
- },
- {
- "name": "microdroid_manager_test"
- },
- {
"name": "serde_cbor_test_tests_bennofs"
},
{
@@ -60,24 +57,6 @@
],
"presubmit-rust": [
{
- "name": "diced_test"
- },
- {
- "name": "diced_vendor_test"
- },
- {
- "name": "keystore2_test"
- },
- {
- "name": "keystore2_test_utils_test"
- },
- {
- "name": "legacykeystore_test"
- },
- {
- "name": "microdroid_manager_test"
- },
- {
"name": "serde_cbor_test_tests_bennofs"
},
{
