Generate apex_available from c2a instead of a patch am: 8ac1c616dc am: c20f8c696b am: 63045bde98 am: 7cc797d01e
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/mio/+/1688984
Change-Id: I0f219ec4c953b39ccfd2d728966b8e32a7851511
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 @@
// 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"]