diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-06-22 11:00:22 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-22 11:00:22 +0000 |
commit | 128bd7cb2e414f5fd2b49409981b9c6dc5f39174 (patch) | |
tree | 7eacc432b6594442c17ca8a3d80652fea62d654c | |
parent | fc13a6ff08fa62aa07aabf9b89a90efccfdeca5d (diff) | |
parent | 409a6b51f1e0fc04c9c9dde708d2ed0766f3e4a4 (diff) | |
download | futures-util-128bd7cb2e414f5fd2b49409981b9c6dc5f39174.tar.gz |
Merge "Make libfutures_util available to DnsResolver" am: 590d610b24 am: 97518d13e2 am: 7284bcf90a am: 409a6b51f1
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/1742913
Change-Id: I07615c9605421cfd947a319b6d07381994eb3124
-rw-r--r-- | Android.bp | 2 | ||||
-rw-r--r-- | cargo2android.json | 2 |
2 files changed, 4 insertions, 0 deletions
@@ -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", |