Merge remote-tracking branch 'goog/master'android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-release

Bug: 197859996
Test: locally
Change-Id: I87f38785a4c4f4205a558adbfb1c7ed29194d1ed

3 files changed, 33 insertions, 2 deletions

diff --git a/Android.bp b/Android.bp
index ce06234..aafe9e0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --device --dependencies --features=serde,std,v1.
+// This file is generated by cargo2android.py --config cargo2android.json.
 // Do not modify this file as changes will be overridden on upgrade.
 
 package {
@@ -45,14 +45,24 @@ rust_library {
     srcs: ["src/lib.rs"],
     edition: "2018",
     features: [
+        "getrandom",
         "serde",
         "std",
         "v1",
+        "v4",
     ],
     rustlibs: [
+        "libgetrandom",
         "libserde",
     ],
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.virt",
+    ],
 }
 
 // dependent_library ["feature_list"]
-//   serde-1.0.124 "default,std"
+//   cfg-if-1.0.0
+//   getrandom-0.2.3
+//   libc-0.2.97
+//   serde-1.0.126 "default,std"
diff --git a/TEST_MAPPING b/TEST_MAPPING
new file mode 100644
index 0000000..59ed96b
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,11 @@
+// Generated by update_crate_tests.py for tests that depend on this crate.
+{
+  "presubmit": [
+    {
+      "name": "apkdmverity.test"
+    },
+    {
+      "name": "virtualizationservice_device_test"
+    }
+  ]
+}
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..21b1d6c
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,10 @@
+{
+  "apex-available": [
+    "//apex_available:platform",
+    "com.android.virt"
+  ],
+  "dependencies": true,
+  "device": true,
+  "features": "serde,std,v1,v4",
+  "run": true
+}
\ No newline at end of file