Merge mnc-dr-enso-dev into master
OpenJDK adjustments for master.
- Restored removed libcore.icu.* classes (needed
by the openjdk java.text.* classes). This will be
undone in short future.
- Adjusted java.lang.* and java.lang.reflect.* classes
for native reflection and other changes in master.
Bug: 25758743
Change-Id: Ifbbe5b1e8661138fc32ad24127f76f711dd585b7
diff --git a/Docs.mk b/Docs.mk
index 7176ff5..2edee0d 100644
--- a/Docs.mk
+++ b/Docs.mk
@@ -5,26 +5,12 @@
ifndef libcore_docs_include_once
+include libcore/openjdk_java_files.mk
+include libcore/non_openjdk_java_files.mk
+
+
# List of libcore javadoc source files
-#
-# Note dalvik/system is non-recursive to exclude dalvik.system.profiler
-_libcore_files := \
- $(call find-files-in-subdirs, libcore, \
- "*.java", \
- dalvik/src/main/java/dalvik/system/ -maxdepth 1) \
- $(call find-files-in-subdirs, libcore, \
- "*.java", \
- dalvik/src/main/java/dalvik/annotation \
- dalvik/src/main/java/dalvik/bytecode \
- json/src/main/java \
- libart/src/main/java/dalvik \
- libart/src/main/java/java \
- luni/src/main/java/android \
- luni/src/main/java/java \
- luni/src/main/java/javax \
- luni/src/main/java/org/xml/sax \
- luni/src/main/java/org/w3c \
- xml/src/main/java/org/xmlpull/v1)
+_libcore_files := $(openjdk_javadoc_files) $(non_openjdk_javadoc_files)
_libcore_files := $(addprefix libcore/, $(_libcore_files))
_icu_files := \