diff options
| author | Jeff Vander Stoep <jeffv@google.com> | 2020-12-23 19:47:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-23 19:47:22 +0000 |
| commit | 7b4d28c235f19fbf85c5fe224acaa6323d7f3b97 (patch) | |
| tree | 4d4135e8d6c1b9bbd6ef60ed96616f21ef69bcbb | |
| parent | 849fd624f42d198aeb870d1337eef9da5d4fc254 (diff) | |
| parent | 44e62e4beb71bb2f6d188477a7f4ee57124031ff (diff) | |
| download | tinyvec_macros-7b4d28c235f19fbf85c5fe224acaa6323d7f3b97.tar.gz | |
Allow using tinyvec_macros from DnsResolver am: 44e62e4beb
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tinyvec_macros/+/1535190
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I022d9e5bf776371786afd029ccefbe1c87d534e3
| -rw-r--r-- | Android.bp | 7 | ||||
| -rw-r--r-- | patches/Android.bp.diff | 16 |
2 files changed, 22 insertions, 1 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --device --dependencies --tests. +// This file is generated by cargo2android.py --run --device --dependencies --tests --patch=patches/Android.bp.patch. rust_library { name: "libtinyvec_macros", @@ -6,6 +6,11 @@ rust_library { crate_name: "tinyvec_macros", srcs: ["src/lib.rs"], edition: "2018", + apex_available: [ + "//apex_available:platform", + "com.android.resolv", + ], + min_sdk_version: "29", } rust_defaults { diff --git a/patches/Android.bp.diff b/patches/Android.bp.diff new file mode 100644 index 0000000..2615117 --- /dev/null +++ b/patches/Android.bp.diff @@ -0,0 +1,16 @@ +diff --git a/Android.bp b/Android.bp +index 0285c46..0c3dae9 100644 +--- a/Android.bp ++++ b/Android.bp +@@ -6,6 +6,11 @@ rust_library { + crate_name: "tinyvec_macros", + srcs: ["src/lib.rs"], + edition: "2018", ++ apex_available: [ ++ "//apex_available:platform", ++ "com.android.resolv", ++ ], ++ min_sdk_version: "29", + } + + rust_defaults { |