diff options
| author | Alan Stokes <alanstokes@google.com> | 2021-06-22 11:22:42 +0100 |
|---|---|---|
| committer | Alan Stokes <alanstokes@google.com> | 2021-06-22 18:04:40 +0100 |
| commit | 9c5ddb959ca8b844253cc079c3c4f39613562370 (patch) | |
| tree | e921ef750d99f7594c7c23a5c02e03bfc547827d | |
| parent | fce0987951cc592637a85f01959483fd62be65a3 (diff) | |
| download | ring-9c5ddb959ca8b844253cc079c3c4f39613562370.tar.gz | |
Allow CompOS APEX to access Ring.
Bug: 191763370
Test: Client code (in progress) builds.
Change-Id: Id5a9a95f91b740c61bc5671cc34bd66799db224e
| -rw-r--r-- | Android.bp | 3 | ||||
| -rw-r--r-- | cargo2android.json | 3 | ||||
| -rw-r--r-- | cargo2android_cc.bp | 2 |
3 files changed, 7 insertions, 1 deletions
@@ -60,6 +60,7 @@ rust_library { ], apex_available: [ "//apex_available:platform", + "com.android.compos", "com.android.resolv", ], min_sdk_version: "29", @@ -440,6 +441,7 @@ cc_library_static { local_include_dirs: ["include"], apex_available: [ "//apex_available:platform", + "com.android.compos", "com.android.resolv", ], min_sdk_version: "29", @@ -454,6 +456,7 @@ cc_library_static { local_include_dirs: ["include"], apex_available: [ "//apex_available:platform", + "com.android.compos", "com.android.resolv", ], min_sdk_version: "29", diff --git a/cargo2android.json b/cargo2android.json index 37f7284..3616930 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -2,6 +2,7 @@ "add-toplevel-block": "cargo2android_cc.bp", "apex-available": [ "//apex_available:platform", + "com.android.compos", "com.android.resolv" ], "dependencies": true, @@ -10,4 +11,4 @@ "min-sdk-version": "29", "run": true, "tests": true -}
\ No newline at end of file +} diff --git a/cargo2android_cc.bp b/cargo2android_cc.bp index ce0e966..ff80698 100644 --- a/cargo2android_cc.bp +++ b/cargo2android_cc.bp @@ -90,6 +90,7 @@ cc_library_static { local_include_dirs: ["include"], apex_available: [ "//apex_available:platform", + "com.android.compos", "com.android.resolv", ], min_sdk_version: "29", @@ -104,6 +105,7 @@ cc_library_static { local_include_dirs: ["include"], apex_available: [ "//apex_available:platform", + "com.android.compos", "com.android.resolv", ], min_sdk_version: "29", |