diff options
author | Luke Huang <huangluke@google.com> | 2021-05-12 12:06:37 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-12 12:06:37 +0000 |
commit | 6c9a00a78b690ca3f86b75d07c5270e21facad62 (patch) | |
tree | e10d0a372aeefa84479d5977eaab1bacb259dba9 | |
parent | e76637450b7aea1fe9b39c3f0dcaca4beecb45d6 (diff) | |
parent | b69c1d063d9df1e419ff381e464075a387bce29a (diff) | |
download | tokio-android-mainline-12.0.0_r44.tar.gz |
Make libtokio available to DnsResolver am: f1a1047f59 am: 7cfbc3e7c6 am: 4bbe6785d4 am: b69c1d063dandroid-mainline-12.0.0_r9android-mainline-12.0.0_r8android-mainline-12.0.0_r78android-mainline-12.0.0_r71android-mainline-12.0.0_r7android-mainline-12.0.0_r68android-mainline-12.0.0_r60android-mainline-12.0.0_r6android-mainline-12.0.0_r58android-mainline-12.0.0_r56android-mainline-12.0.0_r52android-mainline-12.0.0_r51android-mainline-12.0.0_r50android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r48android-mainline-12.0.0_r47android-mainline-12.0.0_r46android-mainline-12.0.0_r45android-mainline-12.0.0_r44android-mainline-12.0.0_r43android-mainline-12.0.0_r42android-mainline-12.0.0_r41android-mainline-12.0.0_r40android-mainline-12.0.0_r39android-mainline-12.0.0_r38android-mainline-12.0.0_r37android-mainline-12.0.0_r35android-mainline-12.0.0_r34android-mainline-12.0.0_r33android-mainline-12.0.0_r32android-mainline-12.0.0_r31android-mainline-12.0.0_r30android-mainline-12.0.0_r3android-mainline-12.0.0_r29android-mainline-12.0.0_r28android-mainline-12.0.0_r27android-mainline-12.0.0_r26android-mainline-12.0.0_r25android-mainline-12.0.0_r24android-mainline-12.0.0_r23android-mainline-12.0.0_r22android-mainline-12.0.0_r21android-mainline-12.0.0_r20android-mainline-12.0.0_r2android-mainline-12.0.0_r19android-mainline-12.0.0_r18android-mainline-12.0.0_r17android-mainline-12.0.0_r16android-mainline-12.0.0_r15android-mainline-12.0.0_r14android-mainline-12.0.0_r13android-mainline-12.0.0_r12android-mainline-12.0.0_r113android-mainline-12.0.0_r11android-mainline-12.0.0_r10android-mainline-12.0.0_r1aml_tz3_311312010aml_pco_311011000aml_doc_310851020android12-mainline-statsd-releaseandroid12-mainline-networkstack-releaseandroid12-mainline-documentsui-releaseandroid12-mainline-conscrypt-releaseandroid12-mainline-captiveportallogin-releaseandroid12-mainline-art-release
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio/+/1705146
Change-Id: I886e29ad9d703c71080836783ba63d3374a3408c
-rw-r--r-- | Android.bp | 5 | ||||
-rw-r--r-- | patches/Android.bp.patch | 30 |
2 files changed, 26 insertions, 9 deletions
@@ -50,6 +50,11 @@ rust_library { "libpin_project_lite", ], proc_macros: ["libtokio_macros"], + 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 index 6c3b89c..759d95f 100644 --- a/patches/Android.bp.patch +++ b/patches/Android.bp.patch @@ -1,8 +1,20 @@ diff --git a/Android.bp b/Android.bp -index b654899..44c598d 100644 +index 6b8ca5b..222916b 100644 --- a/Android.bp +++ b/Android.bp -@@ -61,6 +61,7 @@ rust_defaults { +@@ -50,6 +50,11 @@ rust_library { + "libpin_project_lite", + ], + proc_macros: ["libtokio_macros"], ++ apex_available: [ ++ "//apex_available:platform", ++ "com.android.resolv", ++ ], ++ min_sdk_version: "29", + } + + rust_defaults { +@@ -61,6 +66,7 @@ rust_defaults { features: [ "bytes", "fs", @@ -10,7 +22,7 @@ index b654899..44c598d 100644 "io-util", "libc", "macros", -@@ -108,36 +109,6 @@ rust_test { +@@ -108,36 +114,6 @@ rust_test { srcs: ["tests/buffered.rs"], } @@ -47,7 +59,7 @@ index b654899..44c598d 100644 rust_test_host { name: "tokio_host_test_tests_io_async_read", defaults: ["tokio_defaults"], -@@ -348,51 +319,6 @@ rust_test { +@@ -348,51 +324,6 @@ rust_test { srcs: ["tests/no_rt.rs"], } @@ -99,7 +111,7 @@ index b654899..44c598d 100644 rust_test_host { name: "tokio_host_test_tests_rt_basic", defaults: ["tokio_defaults"], -@@ -423,111 +349,6 @@ rust_test { +@@ -423,111 +354,6 @@ rust_test { srcs: ["tests/rt_threaded.rs"], } @@ -211,7 +223,7 @@ index b654899..44c598d 100644 rust_test_host { name: "tokio_host_test_tests_sync_barrier", defaults: ["tokio_defaults"], -@@ -603,21 +424,6 @@ rust_test { +@@ -603,21 +429,6 @@ rust_test { srcs: ["tests/sync_mutex_owned.rs"], } @@ -233,7 +245,7 @@ index b654899..44c598d 100644 rust_test_host { name: "tokio_host_test_tests_sync_rwlock", defaults: ["tokio_defaults"], -@@ -738,21 +544,6 @@ rust_test { +@@ -738,21 +549,6 @@ rust_test { srcs: ["tests/tcp_shutdown.rs"], } @@ -255,7 +267,7 @@ index b654899..44c598d 100644 rust_test_host { name: "tokio_host_test_tests_time_rt", defaults: ["tokio_defaults"], -@@ -768,21 +559,6 @@ rust_test { +@@ -768,21 +564,6 @@ rust_test { srcs: ["tests/time_rt.rs"], } @@ -277,7 +289,7 @@ index b654899..44c598d 100644 rust_test_host { name: "tokio_host_test_tests_uds_split", defaults: ["tokio_defaults"], -@@ -797,18 +573,3 @@ rust_test { +@@ -797,18 +578,3 @@ rust_test { defaults: ["tokio_defaults"], srcs: ["tests/uds_split.rs"], } |