Snap for 10447354 from 9d39ed49a01b0d31c2b09b2ac20fa9db932d12ed to mainline-cellbroadcast-releaseaml_cbr_341710000aml_cbr_341610000aml_cbr_341510010aml_cbr_341410010aml_cbr_341311010aml_cbr_341110000aml_cbr_341011000aml_cbr_340914000android14-mainline-cellbroadcast-release

Change-Id: I1bd7c425dacf87f08a1cbd4058af2144f5cfb8cc

2 files changed, 34 insertions, 9 deletions

diff --git a/Android.bp b/Android.bp
index 8e6090a..d9ada78 100644
--- a/Android.bp
+++ b/Android.bp
@@ -52,7 +52,7 @@ rust_library_host {
         "syn",
         "syn-error",
     ],
-    cfgs: ["use_fallback"],
+    cfgs: ["skip_ui_tests"],
     rustlibs: [
         "libproc_macro2",
         "libquote",
@@ -60,4 +60,6 @@ rust_library_host {
     ],
     proc_macros: ["libproc_macro_error_attr"],
     compile_multilib: "first",
+    product_available: true,
+    vendor_available: true,
 }
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 8029a19..e9aa65e 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -3,16 +3,39 @@
   "imports": [
     {
       "path": "external/rust/crates/base64"
-    }
-  ],
-  "presubmit": [
+    },
     {
-      "name": "authfs_device_test_src_lib"
-    }
-  ],
-  "presubmit-rust": [
+      "path": "external/rust/crates/libsqlite3-sys"
+    },
+    {
+      "path": "packages/modules/Virtualization/apkdmverity"
+    },
+    {
+      "path": "packages/modules/Virtualization/authfs"
+    },
+    {
+      "path": "packages/modules/Virtualization/avmd"
+    },
+    {
+      "path": "packages/modules/Virtualization/encryptedstore"
+    },
+    {
+      "path": "packages/modules/Virtualization/virtualizationmanager"
+    },
+    {
+      "path": "packages/modules/Virtualization/vm"
+    },
+    {
+      "path": "packages/modules/Virtualization/zipfuse"
+    },
+    {
+      "path": "system/security/diced"
+    },
+    {
+      "path": "system/security/keystore2"
+    },
     {
-      "name": "authfs_device_test_src_lib"
+      "path": "system/security/keystore2/legacykeystore"
     }
   ]
 }