diff options
| author | Jiyong Park <jiyong@google.com> | 2020-12-15 19:03:37 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-15 19:03:37 +0000 |
| commit | 9dcbc59ba6e9a0934b152daccc3a2cd40dc7b672 (patch) | |
| tree | 9a2f8acd2386b55540f2b5e572fb1babbe8945fb | |
| parent | dba8d226b3002bcb77526785099d892ddb513970 (diff) | |
| parent | 98d24af923d944247d460a6c8933dff47ef1a706 (diff) | |
| download | futures-task-9dcbc59ba6e9a0934b152daccc3a2cd40dc7b672.tar.gz | |
add crosvm to com.android.virt am: f2d3df3b22 am: 98d24af923
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-task/+/1526462
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I01991052448abf12ed16688792cb9a02a3156e90
| -rw-r--r-- | Android.bp | 8 | ||||
| -rw-r--r-- | patches/Android.bp.patch | 15 |
2 files changed, 21 insertions, 2 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --device --dependencies --tests. +// This file is generated by cargo2android.py --run --dependencies --device --tests --patch=patches/Android.bp.patch. rust_defaults { name: "futures-task_defaults", @@ -43,7 +43,11 @@ rust_library { rustlibs: [ "libonce_cell", ], + apex_available: [ + "//apex_available:platform", + "com.android.virt", + ], } // dependent_library ["feature_list"] -// once_cell-1.4.1 "std" +// once_cell-1.5.2 "alloc,std" diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch new file mode 100644 index 0000000..2ac6bc4 --- /dev/null +++ b/patches/Android.bp.patch @@ -0,0 +1,15 @@ +diff --git a/Android.bp b/Android.bp +index 76ef162..18bac85 100644 +--- a/Android.bp ++++ b/Android.bp +@@ -43,6 +43,10 @@ rust_library { + rustlibs: [ + "libonce_cell", + ], ++ apex_available: [ ++ "//apex_available:platform", ++ "com.android.virt", ++ ], + } + + // dependent_library ["feature_list"] |