aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2021-06-22 10:20:32 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-06-22 10:20:32 +0000
commit97518d13e29f1d7ab7feed9fb20e14b60ff404e3 (patch)
tree7eacc432b6594442c17ca8a3d80652fea62d654c
parente278122060f2afe024ae92cca8fa6a68a55608e6 (diff)
parent590d610b243cead0fb895039731f4312f9903db1 (diff)
downloadfutures-util-97518d13e29f1d7ab7feed9fb20e14b60ff404e3.tar.gz
Merge "Make libfutures_util available to DnsResolver" am: 590d610b24
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/1742913 Change-Id: Ie5af1bb0e4d9f2cd36ae482e3ee17782cfb0d33e
-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 091608b..3c3ea81 100644
--- a/Android.bp
+++ b/Android.bp
@@ -138,8 +138,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 183357c..8bef0a5 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,
"features": "channel,default,io,memchr,sink",