Generate apex_available from c2a instead of a patch am: 6e21a92345 am: b9ecefff4f am: 33e398951a am: 714e5c0e39
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures/+/1688688
Change-Id: Iab345d96de3d0af840b64568879c62b7bfc842d7
diff --git a/Android.bp b/Android.bp
index 318be0b..d4d4aa2 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 {
@@ -67,14 +67,14 @@
}
// dependent_library ["feature_list"]
-// futures-channel-0.3.13 "alloc,futures-sink,sink,std"
-// futures-core-0.3.13 "alloc,std"
-// futures-executor-0.3.13 "std"
-// futures-io-0.3.13 "std"
-// futures-macro-0.3.13
-// futures-sink-0.3.13 "alloc,std"
-// futures-task-0.3.13 "alloc,std"
-// futures-util-0.3.13 "alloc,async-await,async-await-macro,channel,futures-channel,futures-io,futures-macro,futures-sink,io,memchr,proc-macro-hack,proc-macro-nested,sink,slab,std"
+// futures-channel-0.3.14 "alloc,futures-sink,sink,std"
+// futures-core-0.3.14 "alloc,std"
+// futures-executor-0.3.14 "std"
+// futures-io-0.3.14 "std"
+// futures-macro-0.3.14
+// futures-sink-0.3.14 "alloc,std"
+// futures-task-0.3.14 "alloc,std"
+// futures-util-0.3.14 "alloc,async-await,async-await-macro,channel,futures-channel,futures-io,futures-macro,futures-sink,io,memchr,proc-macro-hack,proc-macro-nested,sink,slab,std"
// memchr-2.3.4 "default,std"
// pin-project-lite-0.2.6
// pin-utils-0.1.0
@@ -82,6 +82,6 @@
// proc-macro-nested-0.1.7
// proc-macro2-1.0.26 "default,proc-macro"
// quote-1.0.9 "default,proc-macro"
-// slab-0.4.2
-// syn-1.0.68 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut"
+// slab-0.4.3 "default,std"
+// syn-1.0.70 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut"
// unicode-xid-0.2.1 "default"
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 6e1c067..0000000
--- a/patches/Android.bp.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/Android.bp b/Android.bp
-index 2061372..52cbb12 100644
---- a/Android.bp
-+++ b/Android.bp
-@@ -23,6 +23,10 @@ rust_library {
- "libfutures_task",
- "libfutures_util",
- ],
-+ apex_available: [
-+ "//apex_available:platform",
-+ "com.android.virt",
-+ ],
- }
-
- // dependent_library ["feature_list"]
