Snap for 7325096 from 018221862b96a8236b3daa90bf7003d17490fcb0 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: If694ce8f47ac426e9bce880d0aa78d07de989ad5

3 files changed, 14 insertions, 18 deletions

diff --git a/Android.bp b/Android.bp
index ebc2312..623b803 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: [
@@ -89,5 +90,5 @@ rust_test {
 }
 
 // dependent_library ["feature_list"]
-//   tinyvec-1.1.1 "alloc,default,tinyvec_macros"
+//   tinyvec-1.2.0 "alloc,default,tinyvec_macros"
 //   tinyvec_macros-0.1.0
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 4d02544..0000000
--- a/patches/Android.bp.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/Android.bp b/Android.bp
-index 9816f84..e294c9b 100644
---- a/Android.bp
-+++ b/Android.bp
-@@ -13,6 +13,11 @@ rust_library {
-     rustlibs: [
-         "libtinyvec",
-     ],
-+    apex_available: [
-+        "//apex_available:platform",
-+        "com.android.resolv",
-+    ],
-+    min_sdk_version: "29",
- }
- 
- rust_defaults {