Skip to content

Commit 92f12f5

Browse files
committed
Add the support libraries to the platform documentation (build).
Updated the make file to generate documentation for the support libs. bug:5629339 Change-Id: I44222f78d002660ad52610083421e4b840ceb541
1 parent 85c7394 commit 92f12f5

File tree

1 file changed

+22
-6
lines changed

1 file changed

+22
-6
lines changed

Android.mk

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -329,20 +329,36 @@ non_base_dirs := \
329329
../../external/apache-http/src/org/apache/http
330330

331331
# These are relative to frameworks/base
332-
dirs_to_document := \
333-
$(fwbase_dirs_to_document) \
332+
dirs_to_check_apis := \
333+
$(fwbase_dirs_to_document) \
334334
$(non_base_dirs)
335335

336+
# These are relative to frameworks/base
337+
# FRAMEWORKS_BASE_SUBDIRS comes from build/core/pathmap.mk
338+
dirs_to_document := \
339+
$(dirs_to_check_apis) \
340+
$(addprefix ../../, $(FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS))
341+
342+
# These are relative to frameworks/base
336343
html_dirs := \
337344
$(FRAMEWORKS_BASE_SUBDIRS) \
338345
$(non_base_dirs)
339346

347+
# Common sources for doc check and api check
348+
common_src_files := \
349+
$(call find-other-html-files, $(html_dirs)) \
350+
$(addprefix ../../libcore/, $(call libcore_to_document, $(LOCAL_PATH)/../../libcore)) \
351+
$(addprefix ../../system/media/mca/, $(call libfilterfw_to_document, $(LOCAL_PATH)/../../system/media/mca)) \
352+
340353
# These are relative to frameworks/base
341354
framework_docs_LOCAL_SRC_FILES := \
342355
$(call find-other-java-files, $(dirs_to_document)) \
343-
$(call find-other-html-files, $(html_dirs)) \
344-
$(addprefix ../../libcore/, $(call libcore_to_document, $(LOCAL_PATH)/../../libcore)) \
345-
$(addprefix ../../system/media/mca/, $(call libfilterfw_to_document, $(LOCAL_PATH)/../../system/media/mca))
356+
$(common_src_files)
357+
358+
# These are relative to frameworks/base
359+
framework_docs_LOCAL_API_CHECK_SRC_FILES := \
360+
$(call find-other-java-files, $(dirs_to_check_apis)) \
361+
$(common_src_files)
346362

347363
# This is used by ide.mk as the list of source files that are
348364
# always included.
@@ -495,7 +511,7 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS += \
495511
# ==== the api stubs and current.xml ===========================
496512
include $(CLEAR_VARS)
497513

498-
LOCAL_SRC_FILES:=$(framework_docs_LOCAL_SRC_FILES)
514+
LOCAL_SRC_FILES:=$(framework_docs_LOCAL_API_CHECK_SRC_FILES)
499515
LOCAL_INTERMEDIATE_SOURCES:=$(framework_docs_LOCAL_INTERMEDIATE_SOURCES)
500516
LOCAL_JAVA_LIBRARIES:=$(framework_docs_LOCAL_JAVA_LIBRARIES)
501517
LOCAL_MODULE_CLASS:=$(framework_docs_LOCAL_MODULE_CLASS)

0 commit comments

Comments
 (0)