commit c086891162b848e75ab8f681c9bae97fdca30f5a
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Jul 07 05:07:43 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Jul 07 05:07:43 2023 +0000
tree 023c788eae6ec1f60fdb71724076c317f014ae60
parent 4742293d9c966485fdb0c11abbead402779fb525
parent 58deb578452ee121e159cc8bc4b2ade814a4e2e8

Snap for 10453563 from 58deb578452ee121e159cc8bc4b2ade814a4e2e8 to mainline-os-statsd-release

Change-Id: I187d31033b020038ad19c14432fc2bafacc20bb4

Android.bp

diff --git a/Android.bp b/Android.bp
index 5239816..ec10a2b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -39,6 +39,7 @@
 
 rust_library {
     name: "libx509_parser",
+    // has rustc warnings
     host_supported: true,
     crate_name: "x509_parser",
     cargo_env_compat: true,
@@ -56,4 +57,10 @@
         "librusticata_macros",
         "libthiserror",
     ],
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.virt",
+    ],
+    product_available: true,
+    vendor_available: true,
 }

TEST_MAPPING

diff --git a/TEST_MAPPING b/TEST_MAPPING
deleted file mode 100644
index 08b3cb2..0000000
--- a/TEST_MAPPING
+++ /dev/null
@@ -1,25 +0,0 @@
-// Generated by update_crate_tests.py for tests that depend on this crate.
-{
-  "presubmit": [
-    {
-      "name": "libapkverify.integration_test"
-    },
-    {
-      "name": "libapkverify.test"
-    },
-    {
-      "name": "microdroid_manager_test"
-    }
-  ],
-  "presubmit-rust": [
-    {
-      "name": "libapkverify.integration_test"
-    },
-    {
-      "name": "libapkverify.test"
-    },
-    {
-      "name": "microdroid_manager_test"
-    }
-  ]
-}

cargo2android.json

diff --git a/cargo2android.json b/cargo2android.json
index c01fbda..b0b6639 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,7 +1,11 @@
 {
+  "apex-available": [
+    "//apex_available:platform",
+    "com.android.virt"
+  ],
   "dependency-blocklist": [
     "data_encoding"
   ],
   "device": true,
   "run": true
-}
\ No newline at end of file
+}