aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2021-06-22 10:30:57 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-06-22 10:30:57 +0000
commitda937e461b27a548abd405498dafea929d594f72 (patch)
tree21cc07804a3528cd196ef0e2c1ab1a94f723f8ad
parent8ef5ec86c029de50a03e93faab9a7b89066a6a52 (diff)
parent1a2f4bbb2946d4bcdae649f2ddffeccff6abf9df (diff)
downloadfutures-task-da937e461b27a548abd405498dafea929d594f72.tar.gz
Merge "Make libfutures_task available to DnsResolver" am: ecfd47d846 am: 1a2f4bbb29
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-task/+/1740780 Change-Id: I3ce67fddfc5d0d40b2b4ea06b7bb50229378a617
-rw-r--r--Android.bp2
-rw-r--r--cargo2android.json2
2 files changed, 4 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index ea6be1e..91514fd 100644
--- a/Android.bp
+++ b/Android.bp
@@ -77,6 +77,8 @@ rust_library {
],
apex_available: [
"//apex_available:platform",
+ "com.android.resolv",
"com.android.virt",
],
+ min_sdk_version: "29",
}
diff --git a/cargo2android.json b/cargo2android.json
index ac56e26..44e747c 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,8 +1,10 @@
{
"apex-available": [
"//apex_available:platform",
+ "com.android.resolv",
"com.android.virt"
],
+ "min_sdk_version": "29",
"dependencies": true,
"device": true,
"run": true,