diff options
| author | Alan Stokes <alanstokes@google.com> | 2021-06-23 08:58:05 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-23 08:58:05 +0000 |
| commit | c473b298e8ee56d8a9052e6cf1d5c8382530c853 (patch) | |
| tree | e921ef750d99f7594c7c23a5c02e03bfc547827d | |
| parent | d8d24fa427a8d7de8dbea3737d712e69b0800626 (diff) | |
| parent | 6e8a7a0d3eb19298a2045fb19c1b887637e2430c (diff) | |
| download | ring-c473b298e8ee56d8a9052e6cf1d5c8382530c853.tar.gz | |
Allow CompOS APEX to access Ring. am: 9c5ddb959c am: 6e8a7a0d3e
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/ring/+/1742148
Change-Id: I3115cdffc5c4b8d914582fba4ff439f21bd10895
| -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", |