diff options
| author | Bernie Innocenti <codewiz@google.com> | 2020-12-21 09:05:57 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-21 09:05:57 +0000 |
| commit | 898c64475ccc09eb50c54af4f1abe9a5964c6c79 (patch) | |
| tree | 6974ab8beead6faa0a303c1f75b099c6b87e4661 | |
| parent | 564d9ca5aaac46bbba52f71ccc8557d761acac52 (diff) | |
| parent | 99c89a09bd3f2f6f32e4df29f087b270d7e7309c (diff) | |
| download | mio-898c64475ccc09eb50c54af4f1abe9a5964c6c79.tar.gz | |
Allow using mio from DnsResolver am: 0fae4327dd am: 99c89a09bd
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/mio/+/1533184
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I254221c2a9e7a2804d94a534d987c0d477eaa966
| -rw-r--r-- | Android.bp | 7 | ||||
| -rw-r--r-- | patches/Android.bp.patch | 14 |
2 files changed, 20 insertions, 1 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --device --dependencies --features os-poll,tcp,udp,uds,os-util. +// This file is generated by cargo2android.py --run --device --dependencies --features os-poll,tcp,udp,uds,os-util --patch=patches/Android.bp.patch. rust_library { name: "libmio", @@ -19,6 +19,11 @@ rust_library { "liblibc", "liblog_rust", ], + 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..a4582df --- /dev/null +++ b/patches/Android.bp.patch @@ -0,0 +1,14 @@ +--- Android.bp 2020-12-21 02:15:37.110815320 +0900 ++++ Android.bp.new 2020-12-19 19:18:22.394348931 +0900 +@@ -19,6 +19,11 @@ rust_library { + "liblibc", + "liblog_rust", + ], ++ apex_available: [ ++ "//apex_available:platform", ++ "com.android.resolv", ++ ], ++ min_sdk_version: "29", + } + + // dependent_library ["feature_list"] |