Generate apex_available from c2a instead of a patchandroid-s-beta-2android-s-beta-1

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

3 files changed, 11 insertions, 17 deletions

diff --git a/Android.bp b/Android.bp
index eb938c1..b922878 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --dependencies --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 {
@@ -62,4 +62,4 @@ rust_library {
 }
 
 // dependent_library ["feature_list"]
-//   futures-core-0.3.13 "alloc,std"
+//   futures-core-0.3.14 "alloc,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 56dc707..0000000
--- a/patches/Android.bp.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/Android.bp b/Android.bp
-index 737bcea..2ccbba4 100644
---- a/Android.bp
-+++ b/Android.bp
-@@ -14,6 +14,10 @@ rust_library {
-     rustlibs: [
-         "libfutures_core",
-     ],
-+    apex_available: [
-+        "//apex_available:platform",
-+        "com.android.virt",
-+    ],
- }
- 
- // dependent_library ["feature_list"]