commit 8ab61fb0ddf137aaa46db0cc371b1d706d08c0f3
author Pete Gillin <peteg@google.com> Tue Aug 21 15:14:55 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Aug 21 15:14:55 2018 +0000
tree 589ab0336684de79af526063183747c2e2808576
parent 3b2cd9244d3e5a3a408be35603dde1e2774a0e57
parent d41686cea5b996b4661f01191bb4f0c9ade96e0d

Merge "Stop reading the generated ojluni sources in droiddoc."

Android.bp

diff --git a/Android.bp b/Android.bp
index 3b27ebc..fd6f825 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1048,10 +1048,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,
@@ -1098,13 +1094,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,
@@ -1483,10 +1475,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,