Generate apex_available from c2a instead of a patch am: 6a34237310 am: cda0442d52 am: a87de93277 am: dc7869c0e6android-mainline-12.0.0_r33android-mainline-12.0.0_r3android-mainline-12.0.0_r26android-mainline-12.0.0_r21android-mainline-12.0.0_r2android-mainline-12.0.0_r1aml_doc_310851020android12-mainline-documentsui-release

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-sink/+/1688689

Change-Id: Ic278a63c172da10c27ad3c165bb36e298593d5d3

3 files changed, 11 insertions, 14 deletions

diff --git a/Android.bp b/Android.bp
index 2c7998f..57724d4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --dependencies --device --tests --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 0000000..ac56e26
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,10 @@
+{
+  "apex-available": [
+    "//apex_available:platform",
+    "com.android.virt"
+  ],
+  "dependencies": true,
+  "device": true,
+  "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 4305fea..0000000
--- a/patches/Android.bp.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Android.bp b/Android.bp
-index a740016..b16050a 100644
---- a/Android.bp
-+++ b/Android.bp
-@@ -35,4 +35,8 @@ rust_library {
-         "default",
-         "std",
-     ],
-+    apex_available: [
-+        "//apex_available:platform",
-+        "com.android.virt",
-+    ],
- }