diff options
| author | Jeff Vander Stoep <jeffv@google.com> | 2020-12-23 20:13:00 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-23 20:13:00 +0000 |
| commit | ba948f5553b45580b8fd3d8c172e24458d8e3b28 (patch) | |
| tree | 7fe63d7750f3879769e23b427d679e41d32886e6 | |
| parent | 3e8199de3f03f1c37635f4bb3ee409725d1c971e (diff) | |
| parent | 1c865b30d86b83343bc83bc6d51aa1ec1ac5db93 (diff) | |
| download | unicode-bidi-ba948f5553b45580b8fd3d8c172e24458d8e3b28.tar.gz | |
Allow using unicode-bidi from DnsResolver am: fb0152d38e am: 1c865b30d8
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/unicode-bidi/+/1535750
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If56f621e941f53bafb3c35dff1bb17f1248d08c0
| -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: "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 { |