diff options
| author | Bernie Innocenti <codewiz@google.com> | 2020-12-15 15:44:19 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-15 15:44:19 +0000 |
| commit | 69d600241563ec011fe620c9cfe465e194f36ba5 (patch) | |
| tree | 5421f883b7d1390c46a93ccc361071b9e8b13be4 | |
| parent | 04e7a2b4d313bd261d0fa126099451c011e0b0f2 (diff) | |
| parent | c2303d96a0bafd6f876c985a004851e2eb5f292d (diff) | |
| download | spin-69d600241563ec011fe620c9cfe465e194f36ba5.tar.gz | |
Allow using spin from DnsResolver am: 60859b459d am: c2303d96a0
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/spin/+/1528089
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie2e20d9476a78e39bf64b1d18fb2795f46097181
| -rw-r--r-- | Android.bp | 5 | ||||
| -rw-r--r-- | patches/Android.bp.patch | 11 |
2 files changed, 14 insertions, 2 deletions
@@ -11,6 +11,11 @@ rust_library { "std", "ticket_mutex", ], + 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 index db27b2e..e8aa924 100644 --- a/patches/Android.bp.patch +++ b/patches/Android.bp.patch @@ -2,15 +2,22 @@ diff --git a/Android.bp b/Android.bp index 96531ab..43db8ef 100644 --- a/Android.bp +++ b/Android.bp -@@ -8,6 +8,7 @@ rust_library { +@@ -8,8 +8,14 @@ rust_library { edition: "2015", features: [ "default", + "std", "ticket_mutex", ], ++ apex_available: [ ++ "//apex_available:platform", ++ "com.android.resolv", ++ ], ++ min_sdk_version: "29", } -@@ -21,6 +22,7 @@ rust_defaults { + + rust_defaults { +@@ -21,6 +27,7 @@ rust_defaults { edition: "2015", features: [ "default", |