Merge "Add a shared filegroup for non-updatable stub sources" am: 4ffb28c5f3 am: 4d79002c3c am: 916e38597d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1655731
Change-Id: I1ac2e12c782acac9087ff741676406557a19859e
diff --git a/Android.bp b/Android.bp
index b23a304..467e179 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1477,6 +1477,18 @@
"--api-lint-ignore-prefix junit. " +
"--api-lint-ignore-prefix org. "
+filegroup {
+ name: "framework-non-updatable-stub-sources",
+ srcs: [
+ ":framework-non-updatable-sources",
+ ":opt-telephony-srcs",
+ ":opt-net-voip-srcs",
+ "core/java/**/*.logtags",
+ "**/package.html",
+ ],
+ visibility: ["//visibility:private"],
+}
+
build = [
"StubLibraries.bp",
"ApiDocs.bp",
diff --git a/ApiDocs.bp b/ApiDocs.bp
index 5e010ff..375ef6e 100644
--- a/ApiDocs.bp
+++ b/ApiDocs.bp
@@ -58,19 +58,15 @@
stubs_defaults {
name: "framework-doc-stubs-default",
srcs: [
+ ":framework-non-updatable-stub-sources",
":framework-mime-sources",
- ":framework-non-updatable-sources",
":framework-updatable-sources",
- "core/java/**/*.logtags",
"test-base/src/**/*.java",
- ":opt-telephony-srcs",
- ":opt-net-voip-srcs",
":art.module.public.api{.public.stubs.source}",
":conscrypt.module.public.api{.public.stubs.source}",
":i18n.module.public.api{.public.stubs.source}",
"test-mock/src/**/*.java",
"test-runner/src/**/*.java",
- "**/package.html",
],
libs: framework_docs_only_libs,
create_doc_stubs: true,
diff --git a/StubLibraries.bp b/StubLibraries.bp
index 9b43749..32123fd8 100644
--- a/StubLibraries.bp
+++ b/StubLibraries.bp
@@ -42,13 +42,7 @@
stubs_defaults {
name: "metalava-non-updatable-api-stubs-default",
- srcs: [
- ":framework-non-updatable-sources",
- "core/java/**/*.logtags",
- ":opt-telephony-srcs",
- ":opt-net-voip-srcs",
- "**/package.html",
- ],
+ srcs: [":framework-non-updatable-stub-sources"],
sdk_version: "none",
system_modules: "none",
java_version: "1.8",
