Generate apex_available from c2a instead of a patch

Test: Run c2a
Test: Build
Change-Id: Iab69de9958e6db58a4904edb8bd2974475a2584c

3 files changed, 24 insertions, 37 deletions

diff --git a/Android.bp b/Android.bp
index 2b17953..9329313 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --device --dependencies --tests --patch=patches/Android.bp.diff.
+// This file is generated by cargo2android.py --config cargo2android.json.
 // Do not modify this file as changes will be overridden on upgrade.
 
 package {
@@ -48,10 +48,7 @@ rust_defaults {
         "default",
         "std",
     ],
-    flags: [
-        "--cfg anyhow_no_ptr_addr_of",
-        "--cfg backtrace",
-    ],
+    cfgs: ["backtrace"],
     rustlibs: [
         "libfutures",
         "libthiserror",
@@ -81,10 +78,7 @@ rust_defaults {
         "default",
         "std",
     ],
-    flags: [
-        "--cfg anyhow_no_ptr_addr_of",
-        "--cfg backtrace",
-    ],
+    cfgs: ["backtrace"],
     rustlibs: [
         "libanyhow",
         "libfutures",
@@ -267,10 +261,7 @@ rust_library {
         "default",
         "std",
     ],
-    flags: [
-        "--cfg anyhow_no_ptr_addr_of",
-        "--cfg backtrace",
-    ],
+    cfgs: ["backtrace"],
     apex_available: [
         "//apex_available:platform",
         "com.android.virt",
@@ -279,13 +270,13 @@ rust_library {
 
 // dependent_library ["feature_list"]
 //   dissimilar-1.0.2
-//   futures-0.3.13
-//   futures-channel-0.3.13 "futures-sink,sink"
-//   futures-core-0.3.13
-//   futures-io-0.3.13
-//   futures-sink-0.3.13
-//   futures-task-0.3.13
-//   futures-util-0.3.13 "futures-sink,sink"
+//   futures-0.3.14
+//   futures-channel-0.3.14 "futures-sink,sink"
+//   futures-core-0.3.14
+//   futures-io-0.3.14
+//   futures-sink-0.3.14
+//   futures-task-0.3.14
+//   futures-util-0.3.14 "futures-sink,sink"
 //   glob-0.3.0
 //   itoa-0.4.7
 //   lazy_static-1.4.0
@@ -298,10 +289,10 @@ rust_library {
 //   serde-1.0.125 "default,derive,serde_derive,std"
 //   serde_derive-1.0.125 "default"
 //   serde_json-1.0.64 "default,std"
-//   syn-1.0.68 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote"
+//   syn-1.0.70 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote"
 //   termcolor-1.1.2
 //   thiserror-1.0.24
 //   thiserror-impl-1.0.24
 //   toml-0.5.8 "default"
-//   trybuild-1.0.41 "diff,dissimilar"
+//   trybuild-1.0.42 "diff,dissimilar"
 //   unicode-xid-0.2.1 "default"
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..458c152
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,11 @@
+{
+  "apex-available": [
+    "//apex_available:platform",
+    "com.android.virt"
+  ],
+  "dependencies": true,
+  "device": true,
+  "patch": "patches/Android.bp.diff",
+  "run": true,
+  "tests": true
+}
\ No newline at end of file
diff --git a/patches/Android.bp.diff b/patches/Android.bp.diff
index 2959c82..3745bac 100644
--- a/patches/Android.bp.diff
+++ b/patches/Android.bp.diff
@@ -26,18 +26,3 @@ index 1099708..a2e3476 100644
  }
  
  rust_test_host {
-diff --git a/Android.bp b/Android.bp
-index ca491cf..2b17953 100644
---- a/Android.bp
-+++ b/Android.bp
-@@ -271,6 +271,10 @@ rust_library {
-         "--cfg anyhow_no_ptr_addr_of",
-         "--cfg backtrace",
-     ],
-+    apex_available: [
-+        "//apex_available:platform",
-+        "com.android.virt",
-+    ],
- }
- 
- // dependent_library ["feature_list"]