diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-30 01:05:27 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-30 01:05:27 +0000 |
commit | afb8fce2f2e52669224a3ead3d66316c793afa2c (patch) | |
tree | 7438235c8339c95bbe4ca7466d8e0bf43e80aa6f | |
parent | a2b59e93d767985ff3d80a7fac7546d789ec1015 (diff) | |
parent | a614b5ee9ff937c15ed2d173a1a23724edc30574 (diff) | |
download | futures-executor-android12-d1-s3-release.tar.gz |
Snap for 7325096 from a614b5ee9ff937c15ed2d173a1a23724edc30574 to sc-d1-releaseandroid-12.0.0_r7android-12.0.0_r6android-12.0.0_r5android-12.0.0_r4android-12.0.0_r15android-12.0.0_r14android-12.0.0_r13android-12.0.0_r12android12-d1-s6-releaseandroid12-d1-s5-releaseandroid12-d1-s4-releaseandroid12-d1-s3-releaseandroid12-d1-s2-releaseandroid12-d1-s1-releaseandroid12-d1-release
Change-Id: I83435012f6d6ef6d39b58bb9ff1dcee71d00f7e2
-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"] |