aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2021-06-22 10:30:25 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-06-22 10:30:25 +0000
commit31fb06ec299af051eb2e5e7af53eaeac6932aee2 (patch)
treee15fe45d4e6fb5f8b1df21c0137acbb9390fd036
parentc1c74762dbe2044706e5f3e36154b93c12c9afba (diff)
parentc4dc3da5a351af530ed5d8cc4fefaaa50892b3c8 (diff)
downloadslab-31fb06ec299af051eb2e5e7af53eaeac6932aee2.tar.gz
Merge "Make libslab available to DnsResolver" am: 14f54f0344 am: c4dc3da5a3
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/slab/+/1741280 Change-Id: Ieca2d527db61e24c01f70b1a1133be0b6da139ed
-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 e5003e7..0cbfb13 100644
--- a/Android.bp
+++ b/Android.bp
@@ -30,8 +30,10 @@ rust_library {
],
apex_available: [
"//apex_available:platform",
+ "com.android.resolv",
"com.android.virt",
],
+ min_sdk_version: "29",
}
rust_defaults {
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,