Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add the support libraries to the platform documentation (build)." into ics-mr1

Browse Source
This commit is contained in:
Svetoslav Ganov
2011-11-18 10:11:35 -08:00
committed by Android (Google) Code Review
parent dea90a0e1c 92f12f5e40
commit 0358787f68
1 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Android.mk
View File

@@ -329,20 +329,36 @@ non_base_dirs := \
../../external/apache-http/src/org/apache/http ../../external/apache-http/src/org/apache/http
# These are relative to frameworks/base # These are relative to frameworks/base
dirs_to_document := \ dirs_to_check_apis := \
$(fwbase_dirs_to_document) \ $(fwbase_dirs_to_document) \
$(non_base_dirs) $(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 := \ html_dirs := \
$(FRAMEWORKS_BASE_SUBDIRS) \ $(FRAMEWORKS_BASE_SUBDIRS) \
$(non_base_dirs) $(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 # These are relative to frameworks/base
framework_docs_LOCAL_SRC_FILES := \ framework_docs_LOCAL_SRC_FILES := \
$(call find-other-java-files, $(dirs_to_document)) \ $(call find-other-java-files, $(dirs_to_document)) \
$(call find-other-html-files, $(html_dirs)) \ $(common_src_files)
$(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_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 # This is used by ide.mk as the list of source files that are
# always included. # always included.
@@ -495,7 +511,7 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS += \
# ==== the api stubs and current.xml =========================== # ==== the api stubs and current.xml ===========================
include $(CLEAR_VARS) 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_INTERMEDIATE_SOURCES:=$(framework_docs_LOCAL_INTERMEDIATE_SOURCES)
LOCAL_JAVA_LIBRARIES:=$(framework_docs_LOCAL_JAVA_LIBRARIES) LOCAL_JAVA_LIBRARIES:=$(framework_docs_LOCAL_JAVA_LIBRARIES)
LOCAL_MODULE_CLASS:=$(framework_docs_LOCAL_MODULE_CLASS) LOCAL_MODULE_CLASS:=$(framework_docs_LOCAL_MODULE_CLASS)