Snap for 7357013 from b69c1d063d9df1e419ff381e464075a387bce29a to sc-releaseandroid-vts-12.0_r9android-vts-12.0_r8android-vts-12.0_r7android-vts-12.0_r6android-vts-12.0_r5android-vts-12.0_r4android-vts-12.0_r3android-vts-12.0_r2android-vts-12.0_r12android-vts-12.0_r11android-vts-12.0_r10android-vts-12.0_r1android-security-12.0.0_r60android-security-12.0.0_r59android-security-12.0.0_r58android-security-12.0.0_r57android-security-12.0.0_r56android-security-12.0.0_r55android-security-12.0.0_r54android-security-12.0.0_r53android-security-12.0.0_r52android-security-12.0.0_r51android-security-12.0.0_r50android-security-12.0.0_r49android-security-12.0.0_r48android-security-12.0.0_r47android-security-12.0.0_r46android-security-12.0.0_r45android-security-12.0.0_r44android-security-12.0.0_r43android-security-12.0.0_r42android-security-12.0.0_r41android-security-12.0.0_r40android-security-12.0.0_r39android-security-12.0.0_r38android-security-12.0.0_r37android-security-12.0.0_r36android-security-12.0.0_r35android-security-12.0.0_r34android-security-11.0.0_r71android-platform-12.0.0_r9android-platform-12.0.0_r8android-platform-12.0.0_r7android-platform-12.0.0_r6android-platform-12.0.0_r5android-platform-12.0.0_r4android-platform-12.0.0_r31android-platform-12.0.0_r30android-platform-12.0.0_r3android-platform-12.0.0_r29android-platform-12.0.0_r28android-platform-12.0.0_r27android-platform-12.0.0_r26android-platform-12.0.0_r25android-platform-12.0.0_r24android-platform-12.0.0_r23android-platform-12.0.0_r22android-platform-12.0.0_r21android-platform-12.0.0_r20android-platform-12.0.0_r2android-platform-12.0.0_r19android-platform-12.0.0_r18android-platform-12.0.0_r17android-platform-12.0.0_r16android-platform-12.0.0_r15android-platform-12.0.0_r14android-platform-12.0.0_r13android-platform-12.0.0_r12android-platform-12.0.0_r11android-platform-12.0.0_r10android-platform-12.0.0_r1android-cts-12.0_r9android-cts-12.0_r8android-cts-12.0_r7android-cts-12.0_r6android-cts-12.0_r5android-cts-12.0_r4android-cts-12.0_r3android-cts-12.0_r2android-cts-12.0_r12android-cts-12.0_r11android-cts-12.0_r10android-cts-12.0_r1android-12.0.0_r9android-12.0.0_r8android-12.0.0_r34android-12.0.0_r33android-12.0.0_r31android-12.0.0_r30android-12.0.0_r3android-12.0.0_r25android-12.0.0_r2android-12.0.0_r11android-12.0.0_r10android-12.0.0_r1android12-tests-releaseandroid12-security-releaseandroid12-s5-releaseandroid12-s4-releaseandroid12-s3-releaseandroid12-s2-releaseandroid12-s1-releaseandroid12-releaseandroid12-platform-release

Change-Id: Ie046c98ffb7811fd1022d6542936e97b7af8f399

2 files changed, 26 insertions, 9 deletions

diff --git a/Android.bp b/Android.bp
index 5a006b4..222916b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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"],
  }