Snap for 8191477 from be59e71aea50702c7f0fbdb5d015eb14129c53fc to tm-frc-ipsec-releaset_frc_ips_330443010android13-frc-ipsec-release

Change-Id: Ie4d73f94f1e1799d42dc4517f7e6a03552fe1be3

3 files changed, 67 insertions, 1 deletions

diff --git a/Android.bp b/Android.bp
index 3efba93..0c62ecb 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --device --dependencies.
+// This file is generated by cargo2android.py --config cargo2android.json.
 // Do not modify this file as changes will be overridden on upgrade.
 
 package {
@@ -42,10 +42,17 @@ rust_library {
     name: "libbyteorder",
     host_supported: true,
     crate_name: "byteorder",
+    cargo_env_compat: true,
+    cargo_pkg_version: "1.4.3",
     srcs: ["src/lib.rs"],
     edition: "2018",
     features: [
         "default",
         "std",
     ],
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.virt",
+    ],
+    vendor_available: true,
 }
diff --git a/TEST_MAPPING b/TEST_MAPPING
new file mode 100644
index 0000000..2868693
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,49 @@
+// Generated by update_crate_tests.py for tests that depend on this crate.
+{
+  "presubmit": [
+    {
+      "name": "ZipFuseTest"
+    },
+    {
+      "name": "apkdmverity.test"
+    },
+    {
+      "name": "libapkverify.integration_test"
+    },
+    {
+      "name": "libapkverify.test"
+    },
+    {
+      "name": "libidsig.test"
+    },
+    {
+      "name": "microdroid_manager_test"
+    },
+    {
+      "name": "virtualizationservice_device_test"
+    }
+  ],
+  "presubmit-rust": [
+    {
+      "name": "ZipFuseTest"
+    },
+    {
+      "name": "apkdmverity.test"
+    },
+    {
+      "name": "libapkverify.integration_test"
+    },
+    {
+      "name": "libapkverify.test"
+    },
+    {
+      "name": "libidsig.test"
+    },
+    {
+      "name": "microdroid_manager_test"
+    },
+    {
+      "name": "virtualizationservice_device_test"
+    }
+  ]
+}
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..721cc1a
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,10 @@
+{
+  "apex-available": [
+    "//apex_available:platform",
+    "com.android.virt"
+  ],
+  "dependencies": true,
+  "device": true,
+  "run": true,
+  "vendor-available": true
+}