From 35c0b09876a3143fe9b0d1d2c05d65e9311d783c Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Tue, 30 Mar 2021 10:46:48 +0100
Subject: [PATCH] Delete framework-updatable-sources filegroup

Inline these sources in the only place it is used.

Bug: 184125529
Test: presubmit
Change-Id: I42e7044471262bf901b8c130a50e1a8a8170c600
---
 Android.bp | 20 --------------------
 ApiDocs.bp | 20 ++++++++++++++++++--
 2 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/Android.bp b/Android.bp
index e5aeea61f2beb..e83cae273e743 100644
--- a/Android.bp
+++ b/Android.bp
@@ -441,26 +441,6 @@ filegroup {
     ],
 }
 
-filegroup {
-    name: "framework-updatable-sources",
-    srcs: [
-        ":framework-appsearch-sources",
-        ":framework-connectivity-sources",
-        ":framework-graphics-srcs",
-        ":framework-mediaprovider-sources",
-        ":framework-permission-sources",
-        ":framework-permission-s-sources",
-        ":framework-scheduling-sources",
-        ":framework-sdkextensions-sources",
-        ":framework-statsd-sources",
-        ":framework-tethering-srcs",
-        ":framework-wifi-updatable-sources",
-        ":ike-srcs",
-        ":updatable-media-srcs",
-    ],
-    visibility: ["//visibility:private"],
-}
-
 java_library {
     name: "framework-updatable-stubs-module_libs_api",
     static_libs: [
diff --git a/ApiDocs.bp b/ApiDocs.bp
index a786bf4adf05b..c1dc00bd3b811 100644
--- a/ApiDocs.bp
+++ b/ApiDocs.bp
@@ -59,11 +59,27 @@ stubs_defaults {
     name: "framework-doc-stubs-default",
     srcs: [
         ":framework-non-updatable-stub-sources",
-        ":framework-updatable-sources",
-        "test-base/src/**/*.java",
+
+        // Module sources
         ":art.module.public.api{.public.stubs.source}",
         ":conscrypt.module.public.api{.public.stubs.source}",
+        ":framework-appsearch-sources",
+        ":framework-connectivity-sources",
+        ":framework-graphics-srcs",
+        ":framework-mediaprovider-sources",
+        ":framework-permission-sources",
+        ":framework-permission-s-sources",
+        ":framework-scheduling-sources",
+        ":framework-sdkextensions-sources",
+        ":framework-statsd-sources",
+        ":framework-tethering-srcs",
+        ":framework-wifi-updatable-sources",
         ":i18n.module.public.api{.public.stubs.source}",
+        ":ike-srcs",
+        ":updatable-media-srcs",
+
+        // No longer part of the stubs, but are included in the docs.
+        "test-base/src/**/*.java",
         "test-mock/src/**/*.java",
         "test-runner/src/**/*.java",
     ],