summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2021-06-22 10:30:51 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-06-22 10:30:51 +0000
commit98bc756a9001d4b2b0bfa8106aeb65cf5a748143 (patch)
tree42341f5f1ef4d94a92b2e94eca275e08a7b1dc34
parent5563652b92215898e8aca2cefe05f9449ad3753c (diff)
parent39842e470b9f8b7096adc3d40d67ae08bb2596fe (diff)
downloadproc-macro-nested-98bc756a9001d4b2b0bfa8106aeb65cf5a748143.tar.gz
Merge "Make libproc_macro_nested available to DnsResolver" am: b861406a39 am: 39842e470b
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-nested/+/1742036 Change-Id: I90f69221d993c69b40f33e20655ee7c44fc9bf56
-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,