Generate apex_available from c2a instead of a patch am: 60e7e48668 am: a1d5e4e693 am: 1c2a7f36ddandroid-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-dev

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

Change-Id: I6ad892e22eac0a1d784edaa940f75b68da66271b

3 files changed, 16 insertions, 21 deletions

diff --git a/Android.bp b/Android.bp
index 549eb4a..f7f51d6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --dependencies --device --features=thread-pool --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 {
@@ -63,11 +63,11 @@ rust_library {
 }
 
 // dependent_library ["feature_list"]
-//   futures-core-0.3.13 "alloc,std"
-//   futures-task-0.3.13 "alloc,std"
-//   futures-util-0.3.13 "alloc,slab,std"
-//   libc-0.2.92 "default,std"
+//   futures-core-0.3.14 "alloc,std"
+//   futures-task-0.3.14 "alloc,std"
+//   futures-util-0.3.14 "alloc,slab,std"
+//   libc-0.2.94 "default,std"
 //   num_cpus-1.13.0
 //   pin-project-lite-0.2.6
 //   pin-utils-0.1.0
-//   slab-0.4.2
+//   slab-0.4.3 "default,std"
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..e195a6a
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,10 @@
+{
+  "apex-available": [
+    "//apex_available:platform",
+    "com.android.virt"
+  ],
+  "dependencies": true,
+  "device": true,
+  "features": "thread-pool",
+  "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 1911beb..0000000
--- a/patches/Android.bp.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/Android.bp b/Android.bp
-index 8b0a7f0..0f6408c 100644
---- a/Android.bp
-+++ b/Android.bp
-@@ -56,6 +56,10 @@ rust_library {
-         "libfutures_util",
-         "libnum_cpus",
-     ],
-+    apex_available: [
-+        "//apex_available:platform",
-+        "com.android.virt",
-+    ],
- }
- 
- // dependent_library ["feature_list"]