diff options
| author | Jeff Vander Stoep <jeffv@google.com> | 2020-12-23 20:18:30 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-23 20:18:30 +0000 |
| commit | 2431c491470decf17a9d54d2b2e3a393e546cb38 (patch) | |
| tree | 697cd4929f6bee489221ab2eea371228e976fb8b | |
| parent | de902d86152380b1b46476799dff58b1e89eb674 (diff) | |
| parent | 43ae45f796a6ca9ce41ed7acee05f817751df71c (diff) | |
| download | url-2431c491470decf17a9d54d2b2e3a393e546cb38.tar.gz | |
Allow using url from DnsResolver am: 93031433dc am: fe2aa09dd1 am: 43ae45f796
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/url/+/1535745
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8ef16f467870e2966a4e60f3288ecca05681c754
| -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: "liburl", @@ -12,6 +12,11 @@ rust_library { "libmatches", "libpercent_encoding", ], + 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..3b90dc3 --- /dev/null +++ b/patches/Android.bp.patch @@ -0,0 +1,16 @@ +diff --git a/Android.bp b/Android.bp +index f3305e8..75e8805 100644 +--- a/Android.bp ++++ b/Android.bp +@@ -12,6 +12,11 @@ rust_library { + "libmatches", + "libpercent_encoding", + ], ++ apex_available: [ ++ "//apex_available:platform", ++ "com.android.resolv", ++ ], ++ min_sdk_version: "29", + } + + rust_defaults { |