diff options
| author | Bernie Innocenti <codewiz@google.com> | 2020-12-12 02:54:01 +0900 |
|---|---|---|
| committer | Bernie Innocenti <codewiz@google.com> | 2020-12-14 18:18:11 +0900 |
| commit | 8dea219a044dca8710888bbf70867e5bbec77c1f (patch) | |
| tree | 7f2d22529c370da3638ec415389d37ce519920be | |
| parent | d7941d9e505971e802733e08947c4e06c331066a (diff) | |
| download | ring-8dea219a044dca8710888bbf70867e5bbec77c1f.tar.gz | |
Allow using ring from the DnsResolver Mainline moduleplatform-tools-31.0.0
Bug: 155855709
Test: m
Change-Id: I812d1e2f7973fddd7a42ae3345c9f7d6a4f43dcb
| -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 { |