Snap for 10453563 from aed99d21caec70de07c009c76262620e16934c0a to mainline-media-releaseaml_med_341711000aml_med_341619000aml_med_341513600aml_med_341312300aml_med_341312020aml_med_341111000aml_med_341011000aml_med_340922010android14-mainline-media-release

Change-Id: I10f3b24bee7a80fb142b2247fbe47bf4c5cc99d3

4 files changed, 46 insertions, 28 deletions

diff --git a/Android.bp b/Android.bp
index 0c62ecb..f327378 100644
--- a/Android.bp
+++ b/Android.bp
@@ -52,7 +52,24 @@ rust_library {
     ],
     apex_available: [
         "//apex_available:platform",
-        "com.android.virt",
+        "//apex_available:anyapex",
+    ],
+    product_available: true,
+    vendor_available: true,
+}
+
+rust_library_rlib {
+    name: "libbyteorder_nostd",
+    crate_name: "byteorder",
+    cargo_env_compat: true,
+    cargo_pkg_version: "1.4.3",
+    srcs: ["src/lib.rs"],
+    edition: "2018",
+    prefer_rlib: true,
+    no_stdlibs: true,
+    stdlibs: [
+        "libcompiler_builtins.rust_sysroot",
+        "libcore.rust_sysroot",
     ],
     vendor_available: true,
 }
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 2868693..f3abb20 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,49 +1,38 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
-  "presubmit": [
+  "imports": [
     {
-      "name": "ZipFuseTest"
+      "path": "external/rust/crates/hashlink"
     },
     {
-      "name": "apkdmverity.test"
+      "path": "external/rust/crates/virtio-drivers"
     },
     {
-      "name": "libapkverify.integration_test"
+      "path": "external/rust/crates/zerocopy"
     },
     {
-      "name": "libapkverify.test"
+      "path": "packages/modules/Virtualization/apkdmverity"
     },
     {
-      "name": "libidsig.test"
+      "path": "packages/modules/Virtualization/avmd"
     },
     {
-      "name": "microdroid_manager_test"
+      "path": "packages/modules/Virtualization/libs/apexutil"
     },
     {
-      "name": "virtualizationservice_device_test"
-    }
-  ],
-  "presubmit-rust": [
-    {
-      "name": "ZipFuseTest"
-    },
-    {
-      "name": "apkdmverity.test"
-    },
-    {
-      "name": "libapkverify.integration_test"
+      "path": "packages/modules/Virtualization/libs/apkverify"
     },
     {
-      "name": "libapkverify.test"
+      "path": "packages/modules/Virtualization/microdroid_manager"
     },
     {
-      "name": "libidsig.test"
+      "path": "packages/modules/Virtualization/virtualizationmanager"
     },
     {
-      "name": "microdroid_manager_test"
+      "path": "packages/modules/Virtualization/vm"
     },
     {
-      "name": "virtualizationservice_device_test"
+      "path": "packages/modules/Virtualization/zipfuse"
     }
   ]
 }
diff --git a/cargo2android.json b/cargo2android.json
index 721cc1a..e63efdb 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,8 +1,5 @@
 {
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.virt"
-  ],
+  "add-toplevel-block": "cargo2android_nostd.bp",
   "dependencies": true,
   "device": true,
   "run": true,
diff --git a/cargo2android_nostd.bp b/cargo2android_nostd.bp
new file mode 100644
index 0000000..1db2e43
--- /dev/null
+++ b/cargo2android_nostd.bp
@@ -0,0 +1,15 @@
+rust_library_rlib {
+    name: "libbyteorder_nostd",
+    crate_name: "byteorder",
+    cargo_env_compat: true,
+    cargo_pkg_version: "1.4.3",
+    srcs: ["src/lib.rs"],
+    edition: "2018",
+    prefer_rlib: true,
+    no_stdlibs: true,
+    stdlibs: [
+        "libcompiler_builtins.rust_sysroot",
+        "libcore.rust_sysroot",
+    ],
+    vendor_available: true,
+}
\ No newline at end of file