summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Vander Stoep <jeffv@google.com>2020-12-23 19:45:51 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-12-23 19:45:51 +0000
commit4cce5087936c488f66a0083e2a8ea3be17276ee6 (patch)
tree01110819ca66b5539fa2cbfe410adc5c395a49f7
parentcaf8d816c6e294cabc10fc08cdabde2ae28a59e2 (diff)
parenteffa614f1b21df122a6db9ad5ef1501cac721a56 (diff)
downloadform_urlencoded-4cce5087936c488f66a0083e2a8ea3be17276ee6.tar.gz
Allow using form_urlencoded from DnsResolver am: effa614f1b
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/form_urlencoded/+/1535010 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ibbcb92d7b2d99ef7115baf0bda8f181e81ae6a0e
-rw-r--r--Android.bp7
-rw-r--r--patches/Android.bp.patch16
2 files changed, 22 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index 7dad1bf..241ef53 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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"]