summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2021-01-26 23:52:49 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-01-26 23:52:49 +0000
commit501ffedb223cd8731f87a4d41074ebd2d96d4ac2 (patch)
tree6320fa960c2d5eaed33ea0da7090aca51af328d4
parent761d2e4198f7ed2b9d5ef11eef4657ca927f6e62 (diff)
parentab95b3352a42df8bae209d2c6b10f08bf6eff12a (diff)
Merge "Add visibility for new location of permission apex." am: 3525be2175 am: e1c8e59876 am: ab95b3352a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560528 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iae221489222ed720b5d91e620f219d6c852173d7
-rw-r--r--apex/permission/framework/Android.bp5
-rw-r--r--apex/permission/service/Android.bp1
2 files changed, 5 insertions, 1 deletions
diff --git a/apex/permission/framework/Android.bp b/apex/permission/framework/Android.bp
index 2150cb41ff5b..52a61674a596 100644
--- a/apex/permission/framework/Android.bp
+++ b/apex/permission/framework/Android.bp
@@ -27,7 +27,10 @@ java_sdk_library {
defaults: ["framework-module-defaults"],
// Restrict access to implementation library.
- impl_library_visibility: ["//frameworks/base/apex/permission:__subpackages__"],
+ impl_library_visibility: [
+ "//frameworks/base/apex/permission:__subpackages__",
+ "//packages/modules/Permission:__subpackages__",
+ ],
srcs: [
":framework-permission-sources",
diff --git a/apex/permission/service/Android.bp b/apex/permission/service/Android.bp
index b7f808214507..d0fc5b9d7c14 100644
--- a/apex/permission/service/Android.bp
+++ b/apex/permission/service/Android.bp
@@ -78,6 +78,7 @@ java_sdk_library {
"//frameworks/base/apex/permission/tests",
"//frameworks/base/services/tests/mockingservicestests",
"//frameworks/base/services/tests/servicestests",
+ "//packages/modules/Permission/tests",
],
srcs: [
":service-permission-sources",