diff options
| author | Andrei-Valentin Onea <andreionea@google.com> | 2021-05-26 14:28:09 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-05-26 14:28:09 +0000 |
| commit | c97307a0ec4ea32a8ae2d9566ae07498fa41134d (patch) | |
| tree | 21e99cc2518d4873a2ac31bc36ae82e7d3186dbb | |
| parent | 24658c8bdf1e4a517cf8588cd3878a3d6dff0120 (diff) | |
| parent | 29a61984c8560a88b9d1eed900ddafcbd4043f98 (diff) | |
Merge changes from topic "fix-module-visibility" into sc-dev
* changes:
Fix media-s-sources visibility
Remove services-all-sources
| -rw-r--r-- | apex/media/service/Android.bp | 4 | ||||
| -rw-r--r-- | services/Android.bp | 11 |
2 files changed, 2 insertions, 13 deletions
diff --git a/apex/media/service/Android.bp b/apex/media/service/Android.bp index 9b3399e8b0e1..271fc5312f8f 100644 --- a/apex/media/service/Android.bp +++ b/apex/media/service/Android.bp @@ -23,10 +23,10 @@ package { filegroup { name: "service-media-s-sources", srcs: [ - "java/**/*.java", + "java/**/*.java", ], path: "java", - visibility: ["//frameworks/base/services"], // TODO(b/177640454): Should be private. + visibility: ["//visibility:private"], } java_sdk_library { diff --git a/services/Android.bp b/services/Android.bp index f2e0b203c3fa..c83a697a71c1 100644 --- a/services/Android.bp +++ b/services/Android.bp @@ -72,17 +72,6 @@ filegroup { visibility: ["//visibility:private"], } -filegroup { - name: "services-all-sources", - srcs: [ - ":services-non-updatable-sources", - ":service-media-s-sources", - ":service-permission-sources", - ":service-statsd-sources", - ], - visibility: ["//visibility:private"], -} - java_library { name: "Slogf", srcs: ["core/java/com/android/server/utils/Slogf.java"], |