Snap for 8512216 from 531d92f1747d8eeca5415f3d76ba9ce36863061b to tm-frc-neuralnetworks-releaset_frc_neu_330443030t_frc_neu_330443000android13-frc-neuralnetworks-release

Change-Id: I718e6076e2a47e2e05fdf92c1c3d627ff376c8ba

3 files changed, 19 insertions, 1 deletions

diff --git a/Android.bp b/Android.bp
index 826dcf6..7f4ff70 100644
--- a/Android.bp
+++ b/Android.bp
@@ -39,6 +39,7 @@ license {
 
 rust_library {
     name: "libnum_integer",
+    // has rustc warnings
     host_supported: true,
     crate_name: "num_integer",
     cargo_env_compat: true,
@@ -53,10 +54,15 @@ rust_library {
     rustlibs: [
         "libnum_traits",
     ],
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.virt",
+    ],
 }
 
 rust_test {
     name: "num-integer_test_src_lib",
+    // has rustc warnings
     host_supported: true,
     crate_name: "num_integer",
     cargo_env_compat: true,
@@ -100,6 +106,7 @@ rust_defaults {
 rust_test {
     name: "num-integer_test_tests_average",
     defaults: ["num-integer_test_defaults"],
+    // has rustc warnings
     host_supported: true,
     srcs: ["tests/average.rs"],
     test_options: {
@@ -110,6 +117,7 @@ rust_test {
 rust_test {
     name: "num-integer_test_tests_roots",
     defaults: ["num-integer_test_defaults"],
+    // has rustc warnings
     host_supported: true,
     srcs: ["tests/roots.rs"],
     test_options: {
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 1a7be13..410aa98 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -16,6 +16,9 @@
       "name": "libapkverify.test"
     },
     {
+      "name": "libcert_request_validator_tests"
+    },
+    {
       "name": "microdroid_manager_test"
     },
     {
@@ -36,6 +39,9 @@
       "name": "libapkverify.test"
     },
     {
+      "name": "libcert_request_validator_tests"
+    },
+    {
       "name": "microdroid_manager_test"
     },
     {
diff --git a/cargo2android.json b/cargo2android.json
index d36fb44..8e490de 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,5 +1,9 @@
 {
+  "apex-available": [
+    "//apex_available:platform",
+    "com.android.virt"
+  ],
   "device": true,
   "run": true,
   "tests": true
-}
\ No newline at end of file
+}