diff options
| author | Jiyong Park <jiyong@google.com> | 2020-12-07 15:50:22 +0900 |
|---|---|---|
| committer | Jiyong Park <jiyong@google.com> | 2020-12-14 16:09:21 +0900 |
| commit | 0d452fd6f8a6703311675254dd8cd61b184dffcd (patch) | |
| tree | 075b3b1279bc73a23f1f9f009746b9de164d34d9 | |
| parent | 8b87033c9a10fb56441f9b2c15eb8a29f93ac2f6 (diff) | |
| download | proc-macro-nested-0d452fd6f8a6703311675254dd8cd61b184dffcd.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: I91e1a4124163fba65e4cc673f4b7cefc9cce45fa
| -rw-r--r-- | Android.bp | 6 | ||||
| -rw-r--r-- | patches/Android.bp.patch | 15 |
2 files changed, 20 insertions, 1 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --device --dependencies --tests --copy-out. +// This file is generated by cargo2android.py --run --dependencies --device --tests --copy-out --patch=patches/Android.bp.patch. genrule { name: "copy_proc-macro-nested_build_out", @@ -16,6 +16,10 @@ rust_library { ":copy_proc-macro-nested_build_out", ], edition: "2015", + apex_available: [ + "//apex_available:platform", + "com.android.virt", + ], } rust_defaults { diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch new file mode 100644 index 0000000..c80e275 --- /dev/null +++ b/patches/Android.bp.patch @@ -0,0 +1,15 @@ +diff --git a/Android.bp b/Android.bp +index b9fd260..103ae9b 100644 +--- a/Android.bp ++++ b/Android.bp +@@ -16,6 +16,10 @@ rust_library { + ":copy_proc-macro-nested_build_out", + ], + edition: "2015", ++ apex_available: [ ++ "//apex_available:platform", ++ "com.android.virt", ++ ], + } + + rust_defaults { |