Snap for 10453563 from ad0c2855601c7796721131e4ee479d7845aec65f to mainline-sdkext-releaseaml_sdk_341510000aml_sdk_341410000aml_sdk_341110080aml_sdk_341110000aml_sdk_341010000aml_sdk_340912010android14-mainline-sdkext-release

Change-Id: I71c374f4dc25f3595ac00e59eebc4edf6d81b016

3 files changed, 13 insertions, 71 deletions

diff --git a/Android.bp b/Android.bp
index 185de12..72b6b37 100644
--- a/Android.bp
+++ b/Android.bp
@@ -49,12 +49,9 @@ 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",
     ],
+    product_available: true,
     vendor_available: true,
     min_sdk_version: "29",
     target: {
@@ -66,5 +63,6 @@ rust_library {
             // liblog is not added as a dependency for linux_musl target
             enabled: false,
         },
-    },
+    }
+    ,
 }
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 619d83c..fe1e142 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -3,82 +3,30 @@
   "imports": [
     {
       "path": "external/rust/crates/android_logger"
-    }
-  ],
-  "presubmit": [
-    {
-      "name": "ZipFuseTest"
-    },
-    {
-      "name": "authfs_device_test_src_lib"
-    },
-    {
-      "name": "doh_unit_test"
-    },
-    {
-      "name": "keystore2_selinux_concurrency_test"
-    },
-    {
-      "name": "keystore2_selinux_test"
-    },
-    {
-      "name": "keystore2_test"
-    },
-    {
-      "name": "logger_device_unit_tests"
-    },
-    {
-      "name": "logger_test_config_log_level"
-    },
-    {
-      "name": "logger_test_default_init"
-    },
-    {
-      "name": "logger_test_env_log_level"
-    },
-    {
-      "name": "logger_test_multiple_init"
-    },
-    {
-      "name": "virtualizationservice_device_test"
-    }
-  ],
-  "presubmit-rust": [
-    {
-      "name": "ZipFuseTest"
-    },
-    {
-      "name": "authfs_device_test_src_lib"
-    },
-    {
-      "name": "doh_unit_test"
-    },
-    {
-      "name": "keystore2_selinux_concurrency_test"
     },
     {
-      "name": "keystore2_selinux_test"
+      "path": "packages/modules/DnsResolver"
     },
     {
-      "name": "keystore2_test"
+      "path": "packages/modules/Virtualization/authfs"
     },
     {
-      "name": "logger_device_unit_tests"
+      "path": "packages/modules/Virtualization/encryptedstore"
     },
     {
-      "name": "logger_test_config_log_level"
+      "path": "packages/modules/Virtualization/virtualizationmanager"
     },
     {
-      "name": "logger_test_default_init"
+      "path": "packages/modules/Virtualization/zipfuse"
     },
     {
-      "name": "logger_test_env_log_level"
+      "path": "system/logging/rust"
     },
     {
-      "name": "logger_test_multiple_init"
+      "path": "system/security/keystore2"
     },
     {
-      "name": "virtualizationservice_device_test"
+      "path": "system/security/keystore2/selinux"
     }
   ]
 }
diff --git a/cargo2android.json b/cargo2android.json
index f07ebe4..17c8006 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -2,11 +2,7 @@
   "add-module-block": "cargo2android_glibc.bp",
   "apex-available": [
     "//apex_available:platform",
-    "com.android.bluetooth",
-    "com.android.compos",
-    "com.android.resolv",
-    "com.android.uwb",
-    "com.android.virt"
+    "//apex_available:anyapex"
   ],
   "dependencies": true,
   "device": true,