Merge "Stop reading the generated ojluni sources in droiddoc." am: 8ab61fb0dd

am: 493a6bddf1

Change-Id: I854208da77dd30445d1e3886f5caaeaf6967c1a0
This commit is contained in:
Pete Gillin
2018-08-21 08:53:53 -07:00
committed by android-build-merger

View File

@@ -1048,10 +1048,6 @@ doc_defaults {
":openjdk_javadoc_files",
":non_openjdk_javadoc_files",
":android_icu4j_src_files_for_docs",
":gen-ojluni-jaif-annotated-srcs",
],
exclude_srcs: [
":annotated_ojluni_files",
],
srcs_lib: "framework",
srcs_lib_whitelist_dirs: frameworks_base_subdirs,
@@ -1098,13 +1094,9 @@ doc_defaults {
":openjdk_javadoc_files",
":non_openjdk_javadoc_files",
":android_icu4j_src_files_for_docs",
":gen-ojluni-jaif-annotated-srcs",
"test-mock/src/**/*.java",
"test-runner/src/**/*.java",
],
exclude_srcs: [
":annotated_ojluni_files",
],
srcs_lib: "framework",
srcs_lib_whitelist_dirs: frameworks_base_subdirs,
srcs_lib_whitelist_pkgs: packages_to_document,
@@ -1483,10 +1475,6 @@ doc_defaults {
":openjdk_javadoc_files",
":non_openjdk_javadoc_files",
":android_icu4j_src_files_for_docs",
":gen-ojluni-jaif-annotated-srcs",
],
exclude_srcs: [
":annotated_ojluni_files",
],
srcs_lib: "framework",
srcs_lib_whitelist_dirs: frameworks_base_subdirs,