diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-06-22 10:30:34 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-22 10:30:34 +0000 |
commit | 0f3f50fac695d04e0012ca8c35de36594ad79fef (patch) | |
tree | d8d1a2805a1f439267ff51c3c0ee5291d480d918 | |
parent | 42adae9f5068706bf1825d38d7744ce1f1b07a76 (diff) | |
parent | 53f76e6588c6253b1c6847a7a7e5b70990de7932 (diff) | |
download | futures-channel-0f3f50fac695d04e0012ca8c35de36594ad79fef.tar.gz |
Merge "Make libfutures_channel available to DnsResolver" am: 196b0d2718 am: 53f76e6588
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-channel/+/1741281
Change-Id: If018cf1d29184d8f2be9951ebcf87eaa96f721f3
-rw-r--r-- | Android.bp | 2 | ||||
-rw-r--r-- | cargo2android.json | 2 |
2 files changed, 4 insertions, 0 deletions
@@ -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 |