Snap for 7325096 from 7ff3771e08c8986974cba124dcccb529c8f78fc9 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: I47db84faeaaa1a594e2b7b84cce5154c401fabce

3 files changed, 18 insertions, 16 deletions

diff --git a/Android.bp b/Android.bp
index 1430c4b..12b55a6 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_slab_license"],
@@ -41,6 +42,9 @@ rust_defaults {
 rust_test_host {
     name: "slab_host_test_src_lib",
     defaults: ["slab_defaults"],
+    test_options: {
+        unit_test: true,
+    },
 }
 
 rust_test {
@@ -63,6 +67,9 @@ rust_defaults {
 rust_test_host {
     name: "slab_host_test_tests_slab",
     defaults: ["slab_defaults_slab"],
+    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 acfab60..0000000
--- a/patches/Android.bp.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/Android.bp b/Android.bp
-index 81236b0..18997c4 100644
---- a/Android.bp
-+++ b/Android.bp
-@@ -6,6 +6,10 @@ rust_library {
-     crate_name: "slab",
-     srcs: ["src/lib.rs"],
-     edition: "2015",
-+    apex_available: [
-+        "//apex_available:platform",
-+        "com.android.virt",
-+    ],
- }
- 
- rust_defaults {