aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2021-06-22 11:00:27 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-06-22 11:00:27 +0000
commita884a1d58398be0ed6becb5cfc6678db686126a6 (patch)
treecc84d7c6e049e53160466e329781e1160cc1b702
parentf3988c8ed1c8e1958451f37ceee87378e35ce8cb (diff)
parent8e5cdfcd635d904855fa2d3a1bfdac010831092a (diff)
downloadfutures-sink-a884a1d58398be0ed6becb5cfc6678db686126a6.tar.gz
Merge "Make libfutures_sink available to DnsResolver" am: ecf5eadadd am: 2f8d18fa98 am: 68f8f6bfca am: 8e5cdfcd63
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-sink/+/1742083 Change-Id: I0ff912bf9c8505c89199cc06e67d8df1c195e5dd
-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 57724d4..ec62b3d 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,