Generate apex_available from c2a instead of a patch am: 77958dee5c am: 6e25df78b6 am: bbadd84aa3 am: 61b74c4fa0android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-release

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

Change-Id: I490416474ed96e6d0529cb6a1fa5139f6340854d

3 files changed, 11 insertions, 17 deletions

diff --git a/Android.bp b/Android.bp
index 03f16a5..50fe7cb 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --device --dependencies --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 {
@@ -41,4 +41,4 @@ rust_library {
 // dependent_library ["feature_list"]
 //   bitflags-1.2.1 "default"
 //   cfg-if-1.0.0
-//   libc-0.2.92 "default,extra_traits,std"
+//   libc-0.2.94 "default,extra_traits,std"
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..42b7833
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,9 @@
+{
+  "apex-available": [
+    "//apex_available:platform",
+    "com.android.virt"
+  ],
+  "dependencies": true,
+  "device": true,
+  "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 525dd17..0000000
--- a/patches/Android.bp.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/Android.bp b/Android.bp
-index a84b87c..d1c7d5b 100644
---- a/Android.bp
-+++ b/Android.bp
-@@ -13,6 +13,10 @@ rust_library {
-         "libcfg_if",
-         "liblibc",
-     ],
-+    apex_available: [
-+        "//apex_available:platform",
-+        "com.android.virt",
-+    ],
- }
- 
- // dependent_library ["feature_list"]