Tracking SamplingProfiler change in libcore
Change-Id: Ic45a1570c01340a5406468a9d0f2a5357175fd80
diff --git a/Android.mk b/Android.mk
index de0112c..aae10dc 100644
--- a/Android.mk
+++ b/Android.mk
@@ -315,7 +315,6 @@
fwbase_dirs_to_document += core/config/sdk
# include definition of libcore_to_document
-# These are relative to libcore
include $(LOCAL_PATH)/../../libcore/Docs.mk
non_base_dirs := \
@@ -324,8 +323,7 @@
# These are relative to frameworks/base
dirs_to_document := \
$(fwbase_dirs_to_document) \
- $(non_base_dirs) \
- $(addprefix ../../libcore/, $(libcore_to_document))
+ $(non_base_dirs)
html_dirs := \
$(FRAMEWORKS_BASE_SUBDIRS) \
@@ -334,7 +332,8 @@
# These are relative to frameworks/base
framework_docs_LOCAL_SRC_FILES := \
$(call find-other-java-files, $(dirs_to_document)) \
- $(call find-other-html-files, $(html_dirs))
+ $(call find-other-html-files, $(html_dirs)) \
+ $(addprefix ../../libcore/, $(call libcore_to_document, $(LOCAL_PATH)/../../libcore))
# This is used by ide.mk as the list of source files that are
# always included.