Stop reading the generated ojluni sources in droiddoc.
These sources contain the result of applying the annotations from
ojluni.jaif to the ojluni sources. Now that ojluni.jaif is empty, this
is a noop, so this change switches back to reading the original
sources.
Bug: 111639530
Test: `make docs` is not affected
Change-Id: Idb98aa4f054a11bfcbcb8a84dd6f357a0a025c49
diff --git a/Android.bp b/Android.bp
index e57e23f..0beb942 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1014,10 +1014,6 @@
":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,
@@ -1064,13 +1060,9 @@
":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,
@@ -1449,10 +1441,6 @@
":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,