Import SamplingProfiler from http://code.google.com/p/dalvik/
cp ~/android/dalvik/profiler/src/main/java/dalvik/profiler/* ~/android/master/libcore/dalvik/src/main/java/dalvik/system/profiler/
cp ~/android/dalvik/profiler/src/test/java/dalvik/profiler/* ~/android/master/libcore/dalvik/src/test/java/dalvik/system/profiler/
perl -p -i -e 's/package dalvik.profiler;/package dalvik.system.profiler;/' ~/android/master/libcore/dalvik/src/*/java/dalvik/system/profiler/*.java
perl -p -i -e 's/import dalvik.profiler./import dalvik.system.profiler./' ~/android/master/libcore/dalvik/src/*/java/dalvik/system/profiler/*.java
Change-Id: Iae3f63327f4a9dde7f037e69c22057e2ea704aaa
diff --git a/Docs.mk b/Docs.mk
index 13eddec..9450139 100644
--- a/Docs.mk
+++ b/Docs.mk
@@ -1,13 +1,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