diff options
| author | Jeffrey Vander Stoep <jeffv@google.com> | 2021-03-12 15:16:04 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-12 15:16:04 +0000 |
| commit | 9fda93e5382d424f55f093893f7800024da728f1 (patch) | |
| tree | f94afd6badf2d98af951c8730edc928faad14d5f | |
| parent | ae449e69a08b95bfc3ec9d850d278cc69af57949 (diff) | |
| parent | 51757ca475bf6b53f70f49ceb5a6d8e772ceca8d (diff) | |
| download | num-traits-9fda93e5382d424f55f093893f7800024da728f1.tar.gz | |
Merge "Make num-traits available to virt apex" am: 5504e4246f am: 51757ca475
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/num-traits/+/1611934
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I459c9a55738a33edf3c5fe802c90435942735247
| -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 --device --run --dependencies --tests. +// This file is generated by cargo2android.py --device --run --dependencies --tests --patch=patches/Android.bp.patch. package { default_applicable_licenses: ["external_rust_crates_num-traits_license"], @@ -46,6 +46,10 @@ rust_library { "default", "std", ], + apex_available: [ + "//apex_available:platform", + "com.android.virt", + ], flags: [ "--cfg has_i128", "--cfg has_to_int_unchecked", diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch new file mode 100644 index 0000000..b61b82c --- /dev/null +++ b/patches/Android.bp.patch @@ -0,0 +1,15 @@ +diff --git a/Android.bp b/Android.bp +index 5abab3c..b920d56 100644 +--- a/Android.bp ++++ b/Android.bp +@@ -46,6 +46,10 @@ rust_library { + "default", + "std", + ], ++ apex_available: [ ++ "//apex_available:platform", ++ "com.android.virt", ++ ], + flags: [ + "--cfg has_i128", + "--cfg has_to_int_unchecked", |