resolved conflicts for merge of cfa84a2a to dalvik-dev

Change-Id: I7765cd4bf03f0b18e60848c30dcce30cbdd7c77b

1 files changed, 25 insertions, 9 deletions

diff --git a/Docs.mk b/Docs.mk
index 1f75a5e..42eee45 100644
--- a/Docs.mk
+++ b/Docs.mk
@@ -2,13 +2,29 @@
 # List of libcore directories to include in documentation.
 # Shared between libcore and frameworks/base.
 
-libcore_to_document := \
- dalvik/src/main/java/dalvik \
- json/src/main/java \
- junit/src/main/java \
- 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 \
+define libcoredoc-all-java-files-under
+$(patsubst ./%,%, \
+  $(shell cd $(1) ; \
+          find $(2) -name "*.java" -and -not -name ".*") \
+ )
+endef
+
+# List of libcore javadoc source files
+# 
+# Note dalvik/system is non-recursive to exclude dalvik.system.profiler
 #
+# $(1): directory for search (to support use from frameworks/base)
+define libcore_to_document
+ $(call libcoredoc-all-java-files-under,$(1),
+   dalvik/src/main/java/dalvik/system/ -maxdepth 1) \
+ $(call libcoredoc-all-java-files-under,$(1),
+   dalvik/src/main/java/dalvik/annotation \
+   dalvik/src/main/java/dalvik/bytecode \
+   json/src/main/java \
+   junit/src/main/java \
+   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)
+endef