diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-30 01:06:21 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-30 01:06:21 +0000 |
commit | 6260744c3d57dc0a57ab289e6f0d4a1c27ef775b (patch) | |
tree | 7438235c8339c95bbe4ca7466d8e0bf43e80aa6f | |
parent | f39a434dc3b10868e7f0f34efcb7ddb58fd8900e (diff) | |
parent | a614b5ee9ff937c15ed2d173a1a23724edc30574 (diff) | |
download | futures-executor-android12-release.tar.gz |
Snap for 7325276 from a614b5ee9ff937c15ed2d173a1a23724edc30574 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_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_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: I0310aea23a5c87879cd6735b57a86d7dba6efb96
-rw-r--r-- | Android.bp | 12 | ||||
-rw-r--r-- | cargo2android.json | 10 | ||||
-rw-r--r-- | patches/Android.bp.patch | 15 |
3 files changed, 16 insertions, 21 deletions
@@ -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"] |