diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-02-22 19:59:29 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-22 19:59:29 +0000 |
| commit | b580018cc323f603e435b1c09dfbaa0549d0ce97 (patch) | |
| tree | 0f951e25bdf42ed5ac2f2d6d3ff102772fb79624 | |
| parent | 3e70a6026c2dcdb45ea3789baaa3d560b151f762 (diff) | |
| parent | 8f2100b5e51d59ad2f21726e3f8ca189247aa9dc (diff) | |
| download | serde_json-b580018cc323f603e435b1c09dfbaa0549d0ce97.tar.gz | |
Merge "Add virtmanager to the virt APEX" am: 2ed40b25a2 am: 230d7d695b am: 8f2100b5e5
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/serde_json/+/1589298
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1cce852105bec1aa5d1935f29c01c0e61136b3c4
| -rw-r--r-- | Android.bp | 4 | ||||
| -rw-r--r-- | patches/Android.bp.patch | 15 |
2 files changed, 19 insertions, 0 deletions
@@ -55,6 +55,10 @@ rust_library { "libryu", "libserde", ], + apex_available: [ + "//apex_available:platform", + "com.android.virt", + ], } // dependent_library ["feature_list"] diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch new file mode 100644 index 0000000..01eddb2 --- /dev/null +++ b/patches/Android.bp.patch @@ -0,0 +1,15 @@ +diff --git a/Android.bp b/Android.bp +index 11e3e28..173735d 100644 +--- a/Android.bp ++++ b/Android.bp +@@ -18,6 +18,10 @@ rust_library { + "libryu", + "libserde", + ], ++ apex_available: [ ++ "//apex_available:platform", ++ "com.android.virt", ++ ], + } + + // dependent_library ["feature_list"] |