diff options
author | Jeff Vander Stoep <jeffv@google.com> | 2020-12-23 20:45:06 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-23 20:45:06 +0000 |
commit | 3baef6d4b724e33fd1dc759278a3cdce1e7fa259 (patch) | |
tree | 01110819ca66b5539fa2cbfe410adc5c395a49f7 | |
parent | be1d76578e3cdf4e761cb33d34ef3d167353311e (diff) | |
parent | f7044b77444a0b25bbfed6133dc7378836b51b8e (diff) | |
download | form_urlencoded-3baef6d4b724e33fd1dc759278a3cdce1e7fa259.tar.gz |
Allow using form_urlencoded from DnsResolver am: effa614f1b am: 4cce508793 am: f7044b7744
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/form_urlencoded/+/1535010
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8ba2c75068e47729ee1108a69a5af725e5c9a895
-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: "libform_urlencoded", @@ -10,6 +10,11 @@ rust_library { "libmatches", "libpercent_encoding", ], + apex_available: [ + "//apex_available:platform", + "com.android.resolv", + ], + min_sdk_version: "29", } // dependent_library ["feature_list"] diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch new file mode 100644 index 0000000..177e109 --- /dev/null +++ b/patches/Android.bp.patch @@ -0,0 +1,16 @@ +diff --git a/Android.bp b/Android.bp +index 7dad1bf..ccb680f 100644 +--- a/Android.bp ++++ b/Android.bp +@@ -10,6 +10,11 @@ rust_library { + "libmatches", + "libpercent_encoding", + ], ++ apex_available: [ ++ "//apex_available:platform", ++ "com.android.resolv", ++ ], ++ min_sdk_version: "29", + } + + // dependent_library ["feature_list"] |