diff options
author | Jeff Vander Stoep <jeffv@google.com> | 2020-12-23 20:12:49 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-23 20:12:49 +0000 |
commit | 653f0a91c6794951a748b5d1121c5ef7b744a68b (patch) | |
tree | 9c489d40ee0b462f754ac75139a46b2c2228df1c | |
parent | 4d0964d30dabcf310e881ff5f9a35073f264119a (diff) | |
parent | 99b469d5fbfb37e1b40aa8967f9059512eb19766 (diff) | |
download | matches-653f0a91c6794951a748b5d1121c5ef7b744a68b.tar.gz |
Allow using matches from DnsResolver am: 28b25f967f am: 99b469d5fb
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/matches/+/1535009
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5ff1e0f0fa69a0180b7cbacad1e4c36c7b9d57f0
-rw-r--r-- | Android.bp | 7 | ||||
-rw-r--r-- | patches/Android.bp.patch | 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: "libmatches", @@ -7,6 +7,11 @@ rust_library { crate_name: "matches", srcs: ["lib.rs"], edition: "2015", + apex_available: [ + "//apex_available:platform", + "com.android.resolv", + ], + min_sdk_version: "29", } rust_defaults { diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch new file mode 100644 index 0000000..d7fd1ba --- /dev/null +++ b/patches/Android.bp.patch @@ -0,0 +1,16 @@ +diff --git a/Android.bp b/Android.bp +index de4144e..dc2efcc 100644 +--- a/Android.bp ++++ b/Android.bp +@@ -7,6 +7,11 @@ rust_library { + crate_name: "matches", + srcs: ["lib.rs"], + edition: "2015", ++ apex_available: [ ++ "//apex_available:platform", ++ "com.android.resolv", ++ ], ++ min_sdk_version: "29", + } + + rust_defaults { |