diff options
| author | Bernie Innocenti <codewiz@google.com> | 2020-12-14 14:07:47 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-14 14:07:47 +0000 |
| commit | 5f6ac6352eda4abe5b1d415f45d7dd155a7fd0f2 (patch) | |
| tree | 8e09089f861173a95eee4ec310cb2d4ed7c96505 | |
| parent | 882b714d590f29552709d1d386f39aeb2d1fb439 (diff) | |
| parent | 9c1034df26df9f5bcff53d67925b06077db15725 (diff) | |
| download | lazy_static-5f6ac6352eda4abe5b1d415f45d7dd155a7fd0f2.tar.gz | |
Allow using lazy_static from Mainline modules am: 9c1034df26
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/lazy_static/+/1526498
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I094083c8bfeee83bd3a710704962f34d14c001cb
| -rw-r--r-- | Android.bp | 7 | ||||
| -rw-r--r-- | patches/Android.bp.diff | 20 |
2 files changed, 26 insertions, 1 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --dependencies --device. +// This file is generated by cargo2android.py --run --device --dependencies --patch=patches/Android.bp.diff. rust_library { name: "liblazy_static", @@ -6,4 +6,9 @@ rust_library { crate_name: "lazy_static", srcs: ["src/lib.rs"], edition: "2015", + apex_available: [ + "//apex_available:platform", + "com.android.resolv", + ], + min_sdk_version: "29", } diff --git a/patches/Android.bp.diff b/patches/Android.bp.diff new file mode 100644 index 0000000..3c1b4cb --- /dev/null +++ b/patches/Android.bp.diff @@ -0,0 +1,20 @@ +--- Android.bp 2020-12-14 18:47:48.373508351 +0900 ++++ Android.bp.new 2020-12-14 18:47:04.753908034 +0900 +@@ -2,8 +2,17 @@ + + rust_library { + name: "liblazy_static", ++ // has rustc warnings + host_supported: true, + crate_name: "lazy_static", + srcs: ["src/lib.rs"], + edition: "2015", ++ apex_available: [ ++ "//apex_available:platform", ++ "com.android.resolv", ++ ], ++ min_sdk_version: "29", + } ++ ++// dependent_library ["feature_list"] ++// doc-comment-0.3.3 |