aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2021-06-22 10:44:04 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-06-22 10:44:04 +0000
commit49ab870bed4190c6cd42fb37321013d09fe7f3a7 (patch)
tree31e9c4407d80a15a2b678e5cf65a1f92065940af
parentf8ee0f58266dc150af2b07766eef612908f0c885 (diff)
parent401211bf3085b5e9971413a1c12acaabe747069f (diff)
downloadfutures-49ab870bed4190c6cd42fb37321013d09fe7f3a7.tar.gz
Merge "Make libfutures available to DnsResolver" am: 197de3f937 am: 8761d9075f am: 401211bf30
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures/+/1742081 Change-Id: Ia34bd7e531439e317ad23727f091206968a83cf5
-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 74903b2..8e70c71 100644
--- a/Android.bp
+++ b/Android.bp
@@ -62,8 +62,10 @@ rust_library {
],
apex_available: [
"//apex_available:platform",
+ "com.android.resolv",
"com.android.virt",
],
+ min_sdk_version: "29",
}
// dependent_library ["feature_list"]
diff --git a/cargo2android.json b/cargo2android.json
index 42b7833..01465d0 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