diff options
author | Joel Galenson <jgalenson@google.com> | 2021-04-28 22:34:26 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-28 22:34:26 +0000 |
commit | 16d61ac55a2fd3863109ca31b5660d5e5bece704 (patch) | |
tree | 8b6893cf49a6d131db38944751abec54b1105e6d | |
parent | b6265deeb8ea9dfbb6e23578a89d03e5d2bc4f23 (diff) | |
parent | 714e5c0e39012ec93e1e1323aa4fe4b9efef8c58 (diff) | |
download | futures-16d61ac55a2fd3863109ca31b5660d5e5bece704.tar.gz |
Generate apex_available from c2a instead of a patch am: 6e21a92345 am: b9ecefff4f am: 33e398951a am: 714e5c0e39android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-release
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures/+/1688688
Change-Id: Iab345d96de3d0af840b64568879c62b7bfc842d7
-rw-r--r-- | Android.bp | 22 | ||||
-rw-r--r-- | cargo2android.json | 9 | ||||
-rw-r--r-- | patches/Android.bp.patch | 15 |
3 files changed, 20 insertions, 26 deletions
@@ -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 @@ rust_library { } // 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 @@ rust_library { // 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"] |