diff options
| author | Jiyong Park <jiyong@google.com> | 2020-12-15 18:28:57 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-15 18:28:57 +0000 |
| commit | 620b4367f2694b76100b59fc5774a9c6125a29ff (patch) | |
| tree | c1cbb4485741835a4d33e95fca3be84148610e07 | |
| parent | 409db94f576fb6751c29459f955d700ad2ce046c (diff) | |
| parent | 20e7835d7509c652d011646e463cddbba2d9f4c9 (diff) | |
| download | bitflags-620b4367f2694b76100b59fc5774a9c6125a29ff.tar.gz | |
add crosvm to com.android.virt am: 20e7835d75
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/bitflags/+/1527444
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie9dea3904b862c33fcc2daf5ca62c22492fe0463
| -rw-r--r-- | Android.bp | 14 | ||||
| -rw-r--r-- | patches/Android.bp.patch | 13 |
2 files changed, 20 insertions, 7 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --device --dependencies --tests. +// This file is generated by cargo2android.py --run --dependencies --device --tests --patch=patches/Android.bp.patch. rust_defaults { name: "bitflags_defaults", @@ -8,9 +8,7 @@ rust_defaults { test_suites: ["general-tests"], auto_gen_config: true, edition: "2015", - features: [ - "default", - ], + features: ["default"], flags: [ "--cfg bitflags_const_fn", ], @@ -33,10 +31,12 @@ rust_library { crate_name: "bitflags", srcs: ["src/lib.rs"], edition: "2015", - features: [ - "default", - ], + features: ["default"], flags: [ "--cfg bitflags_const_fn", ], + apex_available: [ + "//apex_available:platform", + "com.android.virt", + ], } diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch new file mode 100644 index 0000000..580673c --- /dev/null +++ b/patches/Android.bp.patch @@ -0,0 +1,13 @@ +diff --git a/Android.bp b/Android.bp +index 30e65f1..3234f17 100644 +--- a/Android.bp ++++ b/Android.bp +@@ -39,4 +39,8 @@ rust_library { + flags: [ + "--cfg bitflags_const_fn", + ], ++ apex_available: [ ++ "//apex_available:platform", ++ "com.android.virt", ++ ], + } |