From 98d33ff1dccc71cba1a0572affc511f8323011a1 Mon Sep 17 00:00:00 2001
From: Andrei Onea <andreionea@google.com>
Date: Tue, 25 May 2021 15:06:41 +0100
Subject: [PATCH 1/2] Remove services-all-sources

This filegroup is no longer needed.

Test: m
Bug: 177640454
Change-Id: If63a86ae259f5e8bf7ddb1a5b17c6fb75358d655
---
 services/Android.bp | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/services/Android.bp b/services/Android.bp
index 1dd219264575f..cc0fd98c70604 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"],

From 29a61984c8560a88b9d1eed900ddafcbd4043f98 Mon Sep 17 00:00:00 2001
From: Andrei Onea <andreionea@google.com>
Date: Tue, 25 May 2021 14:32:29 +0000
Subject: [PATCH 2/2] Fix media-s-sources visibility

Prevent sources from being leaked elsewhere.

Test: m
Bug: 177640454
Change-Id: I5ff9e8542746b912b618af5b7756d975cdad13ea
---
 apex/media/service/Android.bp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apex/media/service/Android.bp b/apex/media/service/Android.bp
index 9b3399e8b0e1d..271fc5312f8f6 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 {