Generate apex_available from c2a instead of a patch am: 8ac1c616dc am: c20f8c696b am: 63045bde98android-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_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-dev

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/mio/+/1688984

Change-Id: I3e995b02f5ed3489d7ab1181be29bcf85446b54e

3 files changed, 13 insertions, 16 deletions

diff --git a/Android.bp b/Android.bp
index 8812f69..f8e17c2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --device --dependencies --features os-poll,tcp,udp,uds,os-util --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 {
@@ -46,5 +46,5 @@ rust_library {
 
 // dependent_library ["feature_list"]
 //   cfg-if-1.0.0
-//   libc-0.2.92 "default,std"
+//   libc-0.2.94 "default,std"
 //   log-0.4.14 "std"
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..86c4a39
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,11 @@
+{
+  "apex-available": [
+    "//apex_available:platform",
+    "com.android.resolv"
+  ],
+  "dependencies": true,
+  "device": true,
+  "features": "os-poll,tcp,udp,uds,os-util",
+  "min-sdk-version": "29",
+  "run": true
+}
\ No newline at end of file
diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch
deleted file mode 100644
index a4582df..0000000
--- a/patches/Android.bp.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- Android.bp	2020-12-21 02:15:37.110815320 +0900
-+++ Android.bp.new	2020-12-19 19:18:22.394348931 +0900
-@@ -19,6 +19,11 @@ rust_library {
-         "liblibc",
-         "liblog_rust",
-     ],
-+    apex_available: [
-+        "//apex_available:platform",
-+        "com.android.resolv",
-+    ],
-+    min_sdk_version: "29",
- }
- 
- // dependent_library ["feature_list"]