Merge "Add the support libraries to the platform documentation (build)." into ics-mr1
This commit is contained in:
committed by
Android (Google) Code Review
commit
0358787f68
28
Android.mk
28
Android.mk
@@ -329,20 +329,36 @@ non_base_dirs := \
|
||||
../../external/apache-http/src/org/apache/http
|
||||
|
||||
# These are relative to frameworks/base
|
||||
dirs_to_document := \
|
||||
$(fwbase_dirs_to_document) \
|
||||
dirs_to_check_apis := \
|
||||
$(fwbase_dirs_to_document) \
|
||||
$(non_base_dirs)
|
||||
|
||||
# These are relative to frameworks/base
|
||||
# FRAMEWORKS_BASE_SUBDIRS comes from build/core/pathmap.mk
|
||||
dirs_to_document := \
|
||||
$(dirs_to_check_apis) \
|
||||
$(addprefix ../../, $(FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS))
|
||||
|
||||
# These are relative to frameworks/base
|
||||
html_dirs := \
|
||||
$(FRAMEWORKS_BASE_SUBDIRS) \
|
||||
$(non_base_dirs)
|
||||
|
||||
# Common sources for doc check and api check
|
||||
common_src_files := \
|
||||
$(call find-other-html-files, $(html_dirs)) \
|
||||
$(addprefix ../../libcore/, $(call libcore_to_document, $(LOCAL_PATH)/../../libcore)) \
|
||||
$(addprefix ../../system/media/mca/, $(call libfilterfw_to_document, $(LOCAL_PATH)/../../system/media/mca)) \
|
||||
|
||||
# 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)) \
|
||||
$(addprefix ../../libcore/, $(call libcore_to_document, $(LOCAL_PATH)/../../libcore)) \
|
||||
$(addprefix ../../system/media/mca/, $(call libfilterfw_to_document, $(LOCAL_PATH)/../../system/media/mca))
|
||||
$(common_src_files)
|
||||
|
||||
# These are relative to frameworks/base
|
||||
framework_docs_LOCAL_API_CHECK_SRC_FILES := \
|
||||
$(call find-other-java-files, $(dirs_to_check_apis)) \
|
||||
$(common_src_files)
|
||||
|
||||
# This is used by ide.mk as the list of source files that are
|
||||
# always included.
|
||||
@@ -495,7 +511,7 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS += \
|
||||
# ==== the api stubs and current.xml ===========================
|
||||
include $(CLEAR_VARS)
|
||||
|
||||
LOCAL_SRC_FILES:=$(framework_docs_LOCAL_SRC_FILES)
|
||||
LOCAL_SRC_FILES:=$(framework_docs_LOCAL_API_CHECK_SRC_FILES)
|
||||
LOCAL_INTERMEDIATE_SOURCES:=$(framework_docs_LOCAL_INTERMEDIATE_SOURCES)
|
||||
LOCAL_JAVA_LIBRARIES:=$(framework_docs_LOCAL_JAVA_LIBRARIES)
|
||||
LOCAL_MODULE_CLASS:=$(framework_docs_LOCAL_MODULE_CLASS)
|
||||
|
||||
Reference in New Issue
Block a user