diff options
| -rw-r--r-- | Android.bp | 12 | ||||
| -rw-r--r-- | ApiDocs.bp | 6 | ||||
| -rw-r--r-- | StubLibraries.bp | 8 |
3 files changed, 14 insertions, 12 deletions
diff --git a/Android.bp b/Android.bp index b23a30462399..467e1794d55e 100644 --- a/Android.bp +++ b/Android.bp @@ -1477,6 +1477,18 @@ metalava_framework_docs_args = "--manifest $(location core/res/AndroidManifest.x "--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 5e010ff8b266..375ef6ebefe0 100644 --- a/ApiDocs.bp +++ b/ApiDocs.bp @@ -58,19 +58,15 @@ framework_docs_only_libs = [ 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 9b4374973087..32123fd8854d 100644 --- a/StubLibraries.bp +++ b/StubLibraries.bp @@ -42,13 +42,7 @@ packages_to_document = [ 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", |