diff options
author | Andrew Walbran <qwandor@google.com> | 2021-04-01 19:10:30 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-01 19:10:30 +0000 |
commit | 2e2f22ad560e7ad58906a1bb9954aa66e3b717ce (patch) | |
tree | f87160037fb048f2c8ff52d178a9112c66c5efc7 | |
parent | 39a9e7531580a7e6fb41095cdda018c8b80db02c (diff) | |
parent | c69fd801132135e1460697289ab30cc1f98cec93 (diff) | |
download | shared_child-2e2f22ad560e7ad58906a1bb9954aa66e3b717ce.tar.gz |
Allow shared_child crate in com.android.virt apex. am: b174434240 am: b242b8b655 am: 023334c160 am: c69fd80113
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/shared_child/+/1660159
Change-Id: Id0f65358d732686ead56dc22c739811cc11ee890
-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 --device --dependencies --tests --patch=patches/Android.bp.patch. // Do not modify this file as changes will be overridden on upgrade. package { @@ -27,6 +27,10 @@ rust_library { rustlibs: [ "liblibc", ], + apex_available: [ + "//apex_available:platform", + "com.android.virt", + ], } rust_defaults { @@ -55,4 +59,4 @@ rust_test { } // dependent_library ["feature_list"] -// libc-0.2.88 "default,std" +// libc-0.2.92 "default,std" diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch new file mode 100644 index 0000000..cd87fe5 --- /dev/null +++ b/patches/Android.bp.patch @@ -0,0 +1,15 @@ +diff --git a/Android.bp b/Android.bp +index 79874d6..65f30d3 100644 +--- a/Android.bp ++++ b/Android.bp +@@ -10,6 +10,10 @@ rust_library { + rustlibs: [ + "liblibc", + ], ++ apex_available: [ ++ "//apex_available:platform", ++ "com.android.virt", ++ ], + } + + rust_defaults { |