diff options
| author | Jiyong Park <jiyong@google.com> | 2020-12-07 15:42:46 +0900 |
|---|---|---|
| committer | Jiyong Park <jiyong@google.com> | 2020-12-14 16:05:45 +0900 |
| commit | 46caea809ff8cc690fa2329a852179a78ea9d7db (patch) | |
| tree | af9cd9bc4e7eac4b8ce8298cbf408ef482c13439 | |
| parent | c3a90025afed2e4482b96eddfbeaf2c324979bcc (diff) | |
| download | futures-46caea809ff8cc690fa2329a852179a78ea9d7db.tar.gz | |
add crosvm to com.android.virt
To do so, crosvm and its dependencies have the apex_available property
set to "//apex_available:platform", "com.android.virt" to explicitly
acknowledge the joining.
Bug: 174639241
Test: m com.android.virt
Change-Id: I1fae9f3a274220a4b84f635275c43344454454b5
| -rw-r--r-- | Android.bp | 34 | ||||
| -rw-r--r-- | patches/Android.bp.patch | 15 |
2 files changed, 34 insertions, 15 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --device --dependencies. +// This file is generated by cargo2android.py --run --dependencies --device --patch=patches/Android.bp.patch. rust_library { name: "libfutures", @@ -23,26 +23,30 @@ rust_library { "libfutures_task", "libfutures_util", ], + apex_available: [ + "//apex_available:platform", + "com.android.virt", + ], } // dependent_library ["feature_list"] -// futures-channel-0.3.7 "alloc,futures-sink,sink,std" -// futures-core-0.3.7 "alloc,std" -// futures-executor-0.3.7 "std" -// futures-io-0.3.7 "std" -// futures-macro-0.3.7 -// futures-sink-0.3.7 "alloc,std" -// futures-task-0.3.7 "alloc,once_cell,std" -// futures-util-0.3.7 "alloc,async-await,async-await-macro,channel,futures-channel,futures-io,futures-macro,futures-sink,io,memchr,proc-macro-hack,proc-macro-nested,sink,slab,std" -// memchr-2.3.3 "default,std" -// once_cell-1.4.1 "std" -// pin-project-1.0.1 -// pin-project-internal-1.0.1 +// futures-channel-0.3.8 "alloc,futures-sink,sink,std" +// futures-core-0.3.8 "alloc,std" +// futures-executor-0.3.8 "std" +// futures-io-0.3.8 "std" +// futures-macro-0.3.8 +// futures-sink-0.3.8 "alloc,std" +// futures-task-0.3.8 "alloc,once_cell,std" +// futures-util-0.3.8 "alloc,async-await,async-await-macro,channel,futures-channel,futures-io,futures-macro,futures-sink,io,memchr,proc-macro-hack,proc-macro-nested,sink,slab,std" +// memchr-2.3.4 "default,std" +// once_cell-1.5.2 "alloc,std" +// pin-project-1.0.2 +// pin-project-internal-1.0.2 // pin-utils-0.1.0 -// proc-macro-hack-0.5.18 +// proc-macro-hack-0.5.19 // proc-macro-nested-0.1.6 // proc-macro2-1.0.24 "default,proc-macro" // quote-1.0.7 "default,proc-macro" // slab-0.4.2 -// syn-1.0.48 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut" +// syn-1.0.53 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut" // unicode-xid-0.2.1 "default" diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch new file mode 100644 index 0000000..6e1c067 --- /dev/null +++ b/patches/Android.bp.patch @@ -0,0 +1,15 @@ +diff --git a/Android.bp b/Android.bp +index 2061372..52cbb12 100644 +--- a/Android.bp ++++ b/Android.bp +@@ -23,6 +23,10 @@ rust_library { + "libfutures_task", + "libfutures_util", + ], ++ apex_available: [ ++ "//apex_available:platform", ++ "com.android.virt", ++ ], + } + + // dependent_library ["feature_list"] |