diff options
| author | Bernie Innocenti <codewiz@google.com> | 2020-12-14 11:36:15 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-14 11:36:15 +0000 |
| commit | 86b2ff3ed9aabcc9fa3a938d2711d198c9a0837f (patch) | |
| tree | f3c0f1c30d4459c156de5ebfb899e283cdb937c8 | |
| parent | 86f31258c7dd846b50b6052914c924d7b784498f (diff) | |
| parent | f1c99ed59af2b52808efdc058a50d5b32d3ac909 (diff) | |
| download | untrusted-86b2ff3ed9aabcc9fa3a938d2711d198c9a0837f.tar.gz | |
Allow using untrusted from DnsResolver am: 7559815c37 am: f1c99ed59a
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/untrusted/+/1526459
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0e4c571ad22743dc4933854546d221811a9b63a8
| -rw-r--r-- | Android.bp | 7 | ||||
| -rw-r--r-- | patches/Android.bp.patch | 16 |
2 files changed, 22 insertions, 1 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --device --dependencies --tests. +// This file is generated by cargo2android.py --run --device --dependencies --tests --patch=patches/Android.bp.patch. rust_library { name: "libuntrusted", @@ -6,6 +6,11 @@ rust_library { crate_name: "untrusted", srcs: ["src/untrusted.rs"], edition: "2018", + apex_available: [ + "//apex_available:platform", + "com.android.resolv", + ], + min_sdk_version: "29", } rust_defaults { diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch new file mode 100644 index 0000000..90cc841 --- /dev/null +++ b/patches/Android.bp.patch @@ -0,0 +1,16 @@ +diff --git a/Android.bp b/Android.bp +index 52ab13d..eaf9020 100644 +--- a/Android.bp ++++ b/Android.bp +@@ -6,6 +6,11 @@ rust_library { + crate_name: "untrusted", + srcs: ["src/untrusted.rs"], + edition: "2018", ++ apex_available: [ ++ "//apex_available:platform", ++ "com.android.resolv", ++ ], ++ min_sdk_version: "29", + } + + rust_defaults { |