summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2021-06-22 10:57:23 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-06-22 10:57:23 +0000
commit1ec6e06ac57d82e9efacbc30e020ebb5b7ae1dd1 (patch)
tree42341f5f1ef4d94a92b2e94eca275e08a7b1dc34
parent2f7cda054452a5ba20255b7c36fd992fb9d5c028 (diff)
parentf897f60411e500615cfc6c59a5040c6ff5865b84 (diff)
downloadproc-macro-nested-1ec6e06ac57d82e9efacbc30e020ebb5b7ae1dd1.tar.gz
Merge "Make libproc_macro_nested available to DnsResolver" am: b861406a39 am: 39842e470b am: 98bc756a90 am: f897f60411
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-nested/+/1742036 Change-Id: I997b7cfb5afaecff5660be7959ee491b95d8b7ab
-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 7b4b69d..68b8394 100644
--- a/Android.bp
+++ b/Android.bp
@@ -57,8 +57,10 @@ rust_library {
edition: "2015",
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 61885d6..43dbcda 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",
"copy-out": true,
"dependencies": true,
"device": true,