Delete framework-updatable-sources filegroup
Inline these sources in the only place it is used.
Bug: 184125529
Test: presubmit
Change-Id: I42e7044471262bf901b8c130a50e1a8a8170c600
diff --git a/Android.bp b/Android.bp
index e5aeea6..e83cae2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -441,26 +441,6 @@
],
}
-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 a786bf4..c1dc00b 100644
--- a/ApiDocs.bp
+++ b/ApiDocs.bp
@@ -59,11 +59,27 @@
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",
],
