diff options
author | Joel Galenson <jgalenson@google.com> | 2021-04-28 22:10:45 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-28 22:10:45 +0000 |
commit | 054fe6274a4f09c5c9d9e39e2ffce9d17fc0262f (patch) | |
tree | 893295c925ce2ed08dd855e1b29f9b9b48bfd701 | |
parent | bd42804c0d82879869969a7103f63c4efccdbffe (diff) | |
parent | e4add52767bed01a864ba88ba080df2cc9c11b6f (diff) | |
download | futures-util-android-12.1.0_r10.tar.gz |
Generate apex_available from c2a instead of a patch am: 4fa481b6ab am: c09fc84c6f am: e4add52767android-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-util/+/1688788
Change-Id: Idb861a2d2b33e6159c11e2200a2597d1974150d6
-rw-r--r-- | Android.bp | 18 | ||||
-rw-r--r-- | cargo2android.json | 11 | ||||
-rw-r--r-- | patches/Android.bp.patch | 15 |
3 files changed, 20 insertions, 24 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --device --features channel,default,io,memchr,sink --dependencies --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 { @@ -152,15 +152,15 @@ rust_library { // crossbeam-utils-0.7.2 "default,lazy_static,std" // fnv-1.0.7 "default,std" // futures-0.1.31 "default,use_std,with-deprecated" -// futures-channel-0.3.13 "alloc,std" -// futures-core-0.3.13 "alloc,std" -// futures-io-0.3.13 "std" +// futures-channel-0.3.14 "alloc,std" +// futures-core-0.3.14 "alloc,std" +// futures-io-0.3.14 "std" // futures-macro-0.3.13 -// futures-sink-0.3.13 -// futures-task-0.3.13 "alloc,std" +// futures-sink-0.3.14 +// futures-task-0.3.14 "alloc,std" // iovec-0.1.4 // lazy_static-1.4.0 -// libc-0.2.92 "default,std" +// libc-0.2.94 "default,std" // lock_api-0.3.4 // log-0.4.14 // maybe-uninit-2.0.0 @@ -182,9 +182,9 @@ rust_library { // scopeguard-1.1.0 // semver-0.9.0 "default" // semver-parser-0.7.0 -// slab-0.4.2 +// slab-0.4.3 "default,std" // smallvec-0.6.14 "default,std" -// syn-1.0.68 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote" +// syn-1.0.70 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote" // tokio-0.1.22 "bytes,codec,default,fs,io,mio,num_cpus,reactor,rt-full,sync,tcp,timer,tokio-codec,tokio-current-thread,tokio-executor,tokio-fs,tokio-io,tokio-reactor,tokio-sync,tokio-tcp,tokio-threadpool,tokio-timer,tokio-udp,tokio-uds,udp,uds" // tokio-codec-0.1.2 // tokio-current-thread-0.1.7 diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..183357c --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,11 @@ +{ + "apex-available": [ + "//apex_available:platform", + "com.android.virt" + ], + "dependencies": true, + "device": true, + "features": "channel,default,io,memchr,sink", + "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 5fb5d19..0000000 --- a/patches/Android.bp.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/Android.bp b/Android.bp -index 0a32741..ebf776b 100644 ---- a/Android.bp -+++ b/Android.bp -@@ -93,6 +93,10 @@ rust_library { - "libfutures_macro", - "libproc_macro_hack", - ], -+ apex_available: [ -+ "//apex_available:platform", -+ "com.android.virt", -+ ], - } - - // dependent_library ["feature_list"] |