diff options
author | Luke Huang <huangluke@google.com> | 2021-05-12 11:52:38 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-12 11:52:38 +0000 |
commit | b69c1d063d9df1e419ff381e464075a387bce29a (patch) | |
tree | e10d0a372aeefa84479d5977eaab1bacb259dba9 | |
parent | e6eea5e3c36f8037fe843e5663c47a837a827525 (diff) | |
parent | 4bbe6785d41b7663cc499b3667a944ddba5db4ef (diff) | |
download | tokio-android12-qpr1-release.tar.gz |
Make libtokio available to DnsResolver am: f1a1047f59 am: 7cfbc3e7c6 am: 4bbe6785d4android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-dev
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio/+/1705146
Change-Id: I6b22597307e6b93a169ce039893dc0f25f3c70f4
-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"], } |