aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2021-06-22 10:43:33 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-06-22 10:43:33 +0000
commit335f1c1d4f15565a20609fe05d7383560e81f003 (patch)
treed8d1a2805a1f439267ff51c3c0ee5291d480d918
parentb46e1de7d196d2fbc3388e0908caf37529bb6ae7 (diff)
parent0f3f50fac695d04e0012ca8c35de36594ad79fef (diff)
downloadfutures-channel-335f1c1d4f15565a20609fe05d7383560e81f003.tar.gz
Merge "Make libfutures_channel available to DnsResolver" am: 196b0d2718 am: 53f76e6588 am: 0f3f50fac6
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-channel/+/1741281 Change-Id: I84e4d27510d709204ea34e4cd671e18814884196
-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 4e33ede..482071d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -57,8 +57,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