Generate apex_available from c2a instead of a patch am: d0234f2bbf am: 256379a292 am: 08d47934b0 am: ed39197f07android-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/cfg-if/+/1688622

Change-Id: I1c6d8a488c8a940b01ef44938847fe6646cd41f9

3 files changed, 20 insertions, 16 deletions

diff --git a/Android.bp b/Android.bp
index 1c35713..b8d90c9 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,5 @@
-// This file is generated by cargo2android.py --run --dependencies --tests --device --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: ["external_rust_crates_cfg-if_license"],
@@ -48,6 +49,9 @@ rust_defaults {
 rust_test_host {
     name: "cfg-if_host_test_src_lib",
     defaults: ["cfg-if_defaults"],
+    test_options: {
+        unit_test: true,
+    },
 }
 
 rust_test {
@@ -70,6 +74,9 @@ rust_defaults {
 rust_test_host {
     name: "cfg-if_host_test_tests_xcrate",
     defaults: ["cfg-if_defaults_xcrate"],
+    test_options: {
+        unit_test: true,
+    },
 }
 
 rust_test {
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..5412b5b
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,12 @@
+{
+  "apex-available": [
+    "//apex_available:platform",
+    "com.android.resolv",
+    "com.android.virt"
+  ],
+  "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 083dd17..0000000
--- a/patches/Android.bp.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/Android.bp b/Android.bp
-index 78c65e6..82b7964 100644
---- a/Android.bp
-+++ b/Android.bp
-@@ -47,4 +47,10 @@ rust_library {
-     crate_name: "cfg_if",
-     srcs: ["src/lib.rs"],
-     edition: "2018",
-+    apex_available: [
-+        "//apex_available:platform",
-+        "com.android.resolv",
-+        "com.android.virt",
-+    ],
-+    min_sdk_version: "29",
- }