commit bf29295bcd453a10d255b448c60ac671bc7bea5e
author Treehugger Robot <treehugger-gerrit@google.com> Fri Dec 04 07:56:15 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Dec 04 07:56:15 2020 +0000
tree 80d6f4b029e626740d016e26775e2dcc0a0827f3
parent 8ffd8e8cbf37ef29184f1d34e96f9a0a0fffb3c2
parent 804e8f0984906025388aec4d78a8a15d55552d8e

Merge "Fix visibility rules for apex/statsd" am: 3af010fe57 am: aa837402de am: 804e8f0984

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1517519

Change-Id: I9fc8ff51f21368fc33f98d9c598381c3bca1c0fc

apex/framework/Android.bp

diff --git a/apex/framework/Android.bp b/apex/framework/Android.bp
index bf4323d..e4299f5 100644
--- a/apex/framework/Android.bp
+++ b/apex/framework/Android.bp
@@ -45,6 +45,7 @@
     visibility: [
         "//frameworks/base", // For the "global" stubs.
         "//frameworks/base/apex/statsd:__subpackages__",
+        "//packages/modules/StatsD/apex:__subpackages__",
     ],
 }
 java_sdk_library {
@@ -72,7 +73,10 @@
 
     hostdex: true, // for hiddenapi check
 
-    impl_library_visibility: ["//frameworks/base/apex/statsd/framework/test:__subpackages__"],
+    impl_library_visibility: [
+        "//frameworks/base/apex/statsd/framework/test:__subpackages__",
+        "//packages/modules/StatsD/apex/framework/test:__subpackages__",
+    ],
 
     apex_available: [
         "com.android.os.statsd",