diff options
author | Jeffrey Vander Stoep <jeffv@google.com> | 2021-03-12 16:03:12 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-12 16:03:12 +0000 |
commit | 84deda74e0c24ea93382abe2213825c7e03b3f57 (patch) | |
tree | f94afd6badf2d98af951c8730edc928faad14d5f | |
parent | 30904d59c39dec63c8f904c85c18f54a9f1ec529 (diff) | |
parent | 9fda93e5382d424f55f093893f7800024da728f1 (diff) | |
download | num-traits-84deda74e0c24ea93382abe2213825c7e03b3f57.tar.gz |
Merge "Make num-traits available to virt apex" am: 5504e4246f am: 51757ca475 am: 9fda93e538
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/num-traits/+/1611934
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0a8d93253fd8fe6e5d2fa69b6bddfa75d6137704
-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", |