aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Vander Stoep <jeffv@google.com>2020-12-23 19:48:03 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-12-23 19:48:03 +0000
commit1c865b30d86b83343bc83bc6d51aa1ec1ac5db93 (patch)
tree7fe63d7750f3879769e23b427d679e41d32886e6
parentfbcff58bb85ba4f870b12b4416bc3b08e7ddb912 (diff)
parentfb0152d38e8eecd299313ba53a922e91a3eb46c0 (diff)
downloadunicode-bidi-1c865b30d86b83343bc83bc6d51aa1ec1ac5db93.tar.gz
Allow using unicode-bidi from DnsResolver am: fb0152d38e
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/unicode-bidi/+/1535750 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8eac6945c3edda486ade821e3aa41053297b694a
-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 83d60c0..f9a3639 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: "libunicode_bidi",
@@ -11,6 +11,11 @@ rust_library {
rustlibs: [
"libmatches",
],
+ 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..c5ab732
--- /dev/null
+++ b/patches/Android.bp.patch
@@ -0,0 +1,16 @@
+diff --git a/Android.bp b/Android.bp
+index 83d60c0..66ceebd 100644
+--- a/Android.bp
++++ b/Android.bp
+@@ -11,6 +11,11 @@ rust_library {
+ rustlibs: [
+ "libmatches",
+ ],
++ apex_available: [
++ "//apex_available:platform",
++ "com.android.resolv",
++ ],
++ min_sdk_version: "29",
+ }
+
+ rust_defaults {