Snap for 10447354 from 1a939194cba55c527a0bdf39ebb5b4720a437a04 to mainline-wifi-releaseaml_wif_341610000aml_wif_341510000aml_wif_341410080aml_wif_341310010aml_wif_341110010aml_wif_341011010aml_wif_340913010android14-mainline-wifi-release

Change-Id: I78e6a313c09af0714743fd6f6f50984b70eada8f

3 files changed, 20 insertions, 80 deletions

diff --git a/Android.bp b/Android.bp
index 7b32d6f..7ea5eee 100644
--- a/Android.bp
+++ b/Android.bp
@@ -94,10 +94,9 @@ rust_library {
     ],
     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,78 +1,44 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
-  "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"
-    },
+  "imports": [
     {
-      "name": "downcast-rs_test_src_lib"
+      "path": "packages/modules/Virtualization/authfs"
     },
     {
-      "name": "downcast-rs_test_tests_import_via_macro_use"
+      "path": "packages/modules/Virtualization/microdroid_manager"
     },
     {
-      "name": "downcast-rs_test_tests_use_via_namespace"
+      "path": "packages/modules/Virtualization/virtualizationmanager"
     },
     {
-      "name": "keystore2_km_compat_test"
+      "path": "packages/modules/Virtualization/vm"
     },
     {
-      "name": "keystore2_test"
+      "path": "system/keymint/hal"
     },
     {
-      "name": "legacykeystore_test"
+      "path": "system/security/diced"
     },
     {
-      "name": "libbinder_rs-internal_test"
+      "path": "system/security/keystore2"
     },
     {
-      "name": "microdroid_manager_test"
-    },
+      "path": "system/security/keystore2/legacykeystore"
+    }
+  ],
+  "presubmit": [
     {
-      "name": "rustBinderTest"
+      "name": "downcast-rs_test_src_lib"
     },
     {
-      "name": "rustBinderTestService"
+      "name": "downcast-rs_test_tests_import_via_macro_use"
     },
     {
-      "name": "virtualizationservice_device_test"
+      "name": "downcast-rs_test_tests_use_via_namespace"
     }
   ],
   "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
+}