diff options
| author | Jiyong Park <jiyong@google.com> | 2020-12-15 19:20:55 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-15 19:20:55 +0000 |
| commit | a642f4148411e1e5e2eea2fbbfaeb9f29eea6f3a (patch) | |
| tree | 5eea48913e8cf050cfccf611e6805567f4096943 | |
| parent | fbd00d8676e2b5631bbfa8b32dbaa45f786f1f32 (diff) | |
| parent | ddfb6275aa650ad251fd8a89f0d2e19ed58f6b8f (diff) | |
| download | slab-a642f4148411e1e5e2eea2fbbfaeb9f29eea6f3a.tar.gz | |
add crosvm to com.android.virt am: 69084b1268 am: 6e231ecaa5 am: ddfb6275aa
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/slab/+/1526583
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4a1433fffe728c44bfdec80cca2375eaeed27988
| -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 --run --device --tests --dependencies. +// This file is generated by cargo2android.py --run --dependencies --device --tests --patch=patches/Android.bp.patch. rust_library { name: "libslab", @@ -6,6 +6,10 @@ rust_library { crate_name: "slab", srcs: ["src/lib.rs"], edition: "2015", + apex_available: [ + "//apex_available:platform", + "com.android.virt", + ], } rust_defaults { diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch new file mode 100644 index 0000000..acfab60 --- /dev/null +++ b/patches/Android.bp.patch @@ -0,0 +1,15 @@ +diff --git a/Android.bp b/Android.bp +index 81236b0..18997c4 100644 +--- a/Android.bp ++++ b/Android.bp +@@ -6,6 +6,10 @@ rust_library { + crate_name: "slab", + srcs: ["src/lib.rs"], + edition: "2015", ++ apex_available: [ ++ "//apex_available:platform", ++ "com.android.virt", ++ ], + } + + rust_defaults { |