Snap for 7325096 from 737f9c8000629b301e9e0aab85a317ef36e1c03f 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: I4cf6b8079dd639c46668734f0aa4194ccdd2b8d4

3 files changed, 18 insertions, 19 deletions

diff --git a/Android.bp b/Android.bp
index ae3ba16..135442f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,5 @@
-// This file is generated by cargo2android.py --run --device --dependencies --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_unicode-bidi_license"],
@@ -73,6 +74,9 @@ rust_defaults {
 rust_test_host {
     name: "unicode-bidi_host_test_src_lib",
     defaults: ["unicode-bidi_defaults"],
+    test_options: {
+        unit_test: true,
+    },
 }
 
 rust_test {
@@ -82,5 +86,5 @@ rust_test {
 
 // dependent_library ["feature_list"]
 //   matches-0.1.8
-//   serde-1.0.118 "default,std"
-//   serde_test-1.0.118
+//   serde-1.0.125 "default,std"
+//   serde_test-1.0.125
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..911c36f
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,11 @@
+{
+  "apex-available": [
+    "//apex_available:platform",
+    "com.android.resolv"
+  ],
+  "dependencies": true,
+  "device": true,
+  "min-sdk-version": "29",
+  "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 c5ab732..0000000
--- a/patches/Android.bp.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/Android.bp b/Android.bp
-index 83d60c0..66ceebd 100644
---- a/Android.bp
-+++ b/Android.bp
-@@ -11,6 +11,11 @@ rust_library {
-     rustlibs: [
-         "libmatches",
-     ],
-+    apex_available: [
-+        "//apex_available:platform",
-+        "com.android.resolv",
-+    ],
-+    min_sdk_version: "29",
- }
- 
- rust_defaults {