Snap for 7325096 from 59ec4d0e99748c16680f96c1d1fee3176eea6967 to sc-d1-releaseandroid-12.0.0_r7android-12.0.0_r6android-12.0.0_r5android-12.0.0_r4android-12.0.0_r15android-12.0.0_r14android-12.0.0_r13android-12.0.0_r12android12-d1-s6-releaseandroid12-d1-s5-releaseandroid12-d1-s4-releaseandroid12-d1-s3-releaseandroid12-d1-s2-releaseandroid12-d1-s1-releaseandroid12-d1-release

Change-Id: Ifbbb724534eeb6444770aac449c7fe5d703d6666

3 files changed, 21 insertions, 16 deletions

diff --git a/Android.bp b/Android.bp
index 1fb6460..52d4891 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,5 @@
-// This file is generated by cargo2android.py --run --dependencies --device --tests --patch=patches/Android.bp.patch.
+// This file is generated by cargo2android.py --config cargo2android.json.
+// Do not modify this file as changes will be overridden on upgrade.
 
 package {
     default_applicable_licenses: ["external_rust_crates_pin-utils_license"],
@@ -60,6 +61,9 @@ rust_defaults {
 rust_test_host {
     name: "pin-utils_host_test_src_lib",
     defaults: ["pin-utils_defaults"],
+    test_options: {
+        unit_test: true,
+    },
 }
 
 rust_test {
@@ -82,6 +86,9 @@ rust_test_host {
     name: "pin-utils_host_test_tests_projection",
     defaults: ["pin-utils_defaults_pin_utils"],
     srcs: ["tests/projection.rs"],
+    test_options: {
+        unit_test: true,
+    },
 }
 
 rust_test {
@@ -94,6 +101,9 @@ rust_test_host {
     name: "pin-utils_host_test_tests_stack_pin",
     defaults: ["pin-utils_defaults_pin_utils"],
     srcs: ["tests/stack_pin.rs"],
+    test_options: {
+        unit_test: true,
+    },
 }
 
 rust_test {
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..ac56e26
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,10 @@
+{
+  "apex-available": [
+    "//apex_available:platform",
+    "com.android.virt"
+  ],
+  "dependencies": true,
+  "device": true,
+  "run": true,
+  "tests": true
+}
\ No newline at end of file
diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch
deleted file mode 100644
index e0a17ea..0000000
--- a/patches/Android.bp.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/Android.bp b/Android.bp
-index 0a15bc2..65d2df4 100644
---- a/Android.bp
-+++ b/Android.bp
-@@ -6,6 +6,10 @@ rust_library {
-     crate_name: "pin_utils",
-     srcs: ["src/lib.rs"],
-     edition: "2018",
-+    apex_available: [
-+        "//apex_available:platform",
-+        "com.android.virt",
-+    ],
- }
- 
- rust_defaults {