diff options
| author | Bernie Innocenti <codewiz@google.com> | 2020-12-14 14:39:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-14 14:39:21 +0000 |
| commit | 806d66cf3e5d2a49c5c41b990b78b0679b075ec6 (patch) | |
| tree | 7f2d22529c370da3638ec415389d37ce519920be | |
| parent | 4349ede1c632584e64895f11a2177688de66a49e (diff) | |
| parent | 9ec2fae3f4749b3a144730bfe4a665f5cb6a3d07 (diff) | |
| download | ring-806d66cf3e5d2a49c5c41b990b78b0679b075ec6.tar.gz | |
Allow using ring from the DnsResolver Mainline module am: 8dea219a04 am: 4cfc68cd79 am: 9ec2fae3f4
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/ring/+/1526578
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iee305a5efbddde41058110e4037ab718b3fda3a1
| -rw-r--r-- | Android.bp | 10 | ||||
| -rw-r--r-- | patches/Android.bp.diff | 21 |
2 files changed, 25 insertions, 6 deletions
@@ -21,6 +21,11 @@ rust_library { static_libs: [ "libring-core", ], + apex_available: [ + "//apex_available:platform", + "com.android.resolv", + ], + min_sdk_version: "29", } rust_defaults { @@ -138,6 +143,11 @@ cc_library_static { "-DNDEBUG", ], local_include_dirs: ["include"], + apex_available: [ + "//apex_available:platform", + "com.android.resolv", + ], + min_sdk_version: "29", } cc_library_static { diff --git a/patches/Android.bp.diff b/patches/Android.bp.diff index ba7a39a..184ca81 100644 --- a/patches/Android.bp.diff +++ b/patches/Android.bp.diff @@ -1,16 +1,20 @@ -diff --git a/Android.bp b/Android.bp -index c94eb5c..f8380ad 100644 ---- a/Android.bp -+++ b/Android.bp -@@ -20,7 +20,6 @@ rust_library { +--- Android.bp.old 2020-12-14 18:12:19.236831007 +0900 ++++ Android.bp 2020-12-14 18:12:26.756763208 +0900 +@@ -20,8 +20,12 @@ rust_library { ], static_libs: [ "libring-core", - "libring-test", ], ++ apex_available: [ ++ "//apex_available:platform", ++ "com.android.resolv", ++ ], ++ min_sdk_version: "29", } -@@ -49,6 +48,107 @@ rust_defaults { + rust_defaults { +@@ -49,6 +53,112 @@ rust_defaults { ], } @@ -104,6 +108,11 @@ index c94eb5c..f8380ad 100644 + "-DNDEBUG", + ], + local_include_dirs: ["include"], ++ apex_available: [ ++ "//apex_available:platform", ++ "com.android.resolv", ++ ], ++ min_sdk_version: "29", +} + +cc_library_static { |