diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-30 01:06:23 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-30 01:06:23 +0000 |
commit | 36f489755b0e1759039b235db7f2953925e6d915 (patch) | |
tree | 893295c925ce2ed08dd855e1b29f9b9b48bfd701 | |
parent | c4b8abeea4b0668890faf63e9363827a9120f528 (diff) | |
parent | 054fe6274a4f09c5c9d9e39e2ffce9d17fc0262f (diff) | |
download | futures-util-android-vts-12.0_r7.tar.gz |
Snap for 7325276 from 054fe6274a4f09c5c9d9e39e2ffce9d17fc0262f to sc-releaseandroid-vts-12.0_r9android-vts-12.0_r8android-vts-12.0_r7android-vts-12.0_r6android-vts-12.0_r5android-vts-12.0_r4android-vts-12.0_r3android-vts-12.0_r2android-vts-12.0_r12android-vts-12.0_r11android-vts-12.0_r10android-vts-12.0_r1android-security-12.0.0_r60android-security-12.0.0_r59android-security-12.0.0_r58android-security-12.0.0_r57android-security-12.0.0_r56android-security-12.0.0_r55android-security-12.0.0_r54android-security-12.0.0_r53android-security-12.0.0_r52android-security-12.0.0_r51android-security-12.0.0_r50android-security-12.0.0_r49android-security-12.0.0_r48android-security-12.0.0_r47android-security-12.0.0_r46android-security-12.0.0_r45android-security-12.0.0_r44android-security-12.0.0_r43android-security-12.0.0_r42android-security-12.0.0_r41android-security-12.0.0_r40android-security-12.0.0_r39android-security-12.0.0_r38android-security-12.0.0_r37android-security-12.0.0_r36android-security-12.0.0_r35android-security-12.0.0_r34android-security-11.0.0_r71android-platform-12.0.0_r9android-platform-12.0.0_r8android-platform-12.0.0_r7android-platform-12.0.0_r6android-platform-12.0.0_r5android-platform-12.0.0_r4android-platform-12.0.0_r32android-platform-12.0.0_r31android-platform-12.0.0_r30android-platform-12.0.0_r3android-platform-12.0.0_r29android-platform-12.0.0_r28android-platform-12.0.0_r27android-platform-12.0.0_r26android-platform-12.0.0_r25android-platform-12.0.0_r24android-platform-12.0.0_r23android-platform-12.0.0_r22android-platform-12.0.0_r21android-platform-12.0.0_r20android-platform-12.0.0_r2android-platform-12.0.0_r19android-platform-12.0.0_r18android-platform-12.0.0_r17android-platform-12.0.0_r16android-platform-12.0.0_r15android-platform-12.0.0_r14android-platform-12.0.0_r13android-platform-12.0.0_r12android-platform-12.0.0_r11android-platform-12.0.0_r10android-platform-12.0.0_r1android-cts-12.0_r9android-cts-12.0_r8android-cts-12.0_r7android-cts-12.0_r6android-cts-12.0_r5android-cts-12.0_r4android-cts-12.0_r3android-cts-12.0_r2android-cts-12.0_r12android-cts-12.0_r11android-cts-12.0_r10android-cts-12.0_r1android-12.0.0_r9android-12.0.0_r8android-12.0.0_r34android-12.0.0_r33android-12.0.0_r31android-12.0.0_r30android-12.0.0_r3android-12.0.0_r25android-12.0.0_r2android-12.0.0_r11android-12.0.0_r10android-12.0.0_r1android12-tests-releaseandroid12-security-releaseandroid12-s5-releaseandroid12-s4-releaseandroid12-s3-releaseandroid12-s2-releaseandroid12-s1-releaseandroid12-releaseandroid12-platform-release
Change-Id: I976af6e86b3b4120fdf3268285c93fb15afd1dda
-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"] |