Merge "Generate apex_available from c2a instead of a patch" am: 69d27e88b2 am: a74a37c16d am: 4534b8bf15 am: cef601b3c2

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

Change-Id: Ic1275cffd4821eec97fbe560ae7947d43a79b5c7

3 files changed, 14 insertions, 14 deletions

diff --git a/Android.bp b/Android.bp
index 48205a60..2d649dee 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --dependencies --tests --device --features=default,extra_traits,std --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 {
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 00000000..c2cbd410
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,13 @@
+{
+  "apex-available": [
+    "//apex_available:platform",
+    "com.android.resolv",
+    "com.android.virt"
+  ],
+  "dependencies": true,
+  "device": true,
+  "features": "default,extra_traits,std",
+  "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 59e2418f..00000000
--- a/patches/Android.bp.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- Android.bp	2020-12-14 23:34:21.725521979 +0900
-+++ Android.bp.new	2020-12-14 23:30:18.808503638 +0900
-@@ -135,4 +135,10 @@ rust_library {
-         "libc_priv_mod_use",
-         "libc_union",
-     ],
-+    apex_available: [
-+        "//apex_available:platform",
-+        "com.android.resolv",
-+        "com.android.virt",
-+    ],
-+    min_sdk_version: "29",
- }