summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2021-01-27 07:55:51 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-01-27 07:55:51 +0000
commit98818a5177391bdadf02be08f1a4985a182e73c9 (patch)
tree77f4207994cad34b9fa812efec6e4657096caa28
parente3c7e5b303474975486bd748c119f13970b7e58d (diff)
parentea03a338bd33057852d8fe3f135939de3114f1b6 (diff)
Merge "Add visibility for new location of permission apex." am: 3525be2175 am: c8fec8ca93 am: ea03a338bd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560528 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia25202e2d5f9ea3beffdaaaf6620436804756a7a
-rw-r--r--framework/Android.bp5
-rw-r--r--service/Android.bp1
2 files changed, 5 insertions, 1 deletions
diff --git a/framework/Android.bp b/framework/Android.bp
index 2150cb41f..52a61674a 100644
--- a/framework/Android.bp
+++ b/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/service/Android.bp b/service/Android.bp
index b7f808214..d0fc5b9d7 100644
--- a/service/Android.bp
+++ b/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",