summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Stokes <alanstokes@google.com>2022-05-26 15:05:01 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-05-26 15:05:01 +0000
commit92fa46e905347681103d881d12067f2daa875ff6 (patch)
tree5dcdf0f017e420936bb4fde41481e9aefff0c68d
parent801e89d363fbcbb14edd9ea76b5cccab225a40cc (diff)
parent25b0ddb42af279077055da4344e11558352fbab6 (diff)
downloadring-92fa46e905347681103d881d12067f2daa875ff6.tar.gz
Remove access from CompOS/Virtualization APEXes am: 25b0ddb42a
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/ring/+/2106353 Change-Id: I416f2b87684468b2a630b20add0e69ce1369e793 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp6
-rw-r--r--cargo2android.json4
-rw-r--r--cargo2android_cc.bp4
3 files changed, 1 insertions, 13 deletions
diff --git a/Android.bp b/Android.bp
index 8825101..9203f0c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -61,9 +61,7 @@ rust_library {
],
apex_available: [
"//apex_available:platform",
- "com.android.compos",
"com.android.resolv",
- "com.android.virt",
],
min_sdk_version: "29",
}
@@ -347,9 +345,7 @@ cc_library_static {
local_include_dirs: ["include"],
apex_available: [
"//apex_available:platform",
- "com.android.compos",
"com.android.resolv",
- "com.android.virt",
],
min_sdk_version: "29",
}
@@ -363,9 +359,7 @@ cc_library_static {
local_include_dirs: ["include"],
apex_available: [
"//apex_available:platform",
- "com.android.compos",
"com.android.resolv",
- "com.android.virt",
],
min_sdk_version: "29",
}
diff --git a/cargo2android.json b/cargo2android.json
index 2809212..f438352 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -2,9 +2,7 @@
"add-toplevel-block": "cargo2android_cc.bp",
"apex-available": [
"//apex_available:platform",
- "com.android.compos",
"com.android.resolv",
- "com.android.virt"
],
"dependencies": true,
"device": true,
@@ -16,4 +14,4 @@
"ring-core",
"ring-test"
]
-} \ No newline at end of file
+}
diff --git a/cargo2android_cc.bp b/cargo2android_cc.bp
index 179d7f8..918cfbe 100644
--- a/cargo2android_cc.bp
+++ b/cargo2android_cc.bp
@@ -91,9 +91,7 @@ cc_library_static {
local_include_dirs: ["include"],
apex_available: [
"//apex_available:platform",
- "com.android.compos",
"com.android.resolv",
- "com.android.virt",
],
min_sdk_version: "29",
}
@@ -107,9 +105,7 @@ cc_library_static {
local_include_dirs: ["include"],
apex_available: [
"//apex_available:platform",
- "com.android.compos",
"com.android.resolv",
- "com.android.virt",
],
min_sdk_version: "29",
} \ No newline at end of file