Merge "Fix MonkeyRunner SDK documentation generation."

This commit is contained in:
Bill Napier
2010-08-27 09:10:42 -07:00
committed by Android (Google) Code Review

View File

@@ -355,7 +355,7 @@ framework_docs_LOCAL_JAVA_LIBRARIES := \
framework \
framework_docs_LOCAL_MODULE_CLASS := JAVA_LIBRARIES
framework_docs_LOCAL_DROIDDOC_HTML_DIR := docs/html
framework_docs_LOCAL_DROIDDOC_HTML_DIR := $(LOCAL_PATH)/docs/html $(OUT_DOCS)/gen
# The since flag (-since N.xml API_LEVEL) is used to add API Level information
# to the reference documentation. Must be in order of oldest to newest.
framework_docs_LOCAL_DROIDDOC_OPTIONS := \
@@ -522,7 +522,7 @@ $(static_doc_index_redirect): \
$(full_target): $(static_doc_index_redirect)
$(full_target): $(framework_built)
$(full_target): monkeyruner-docs-target
# ==== docs for the web (on the google app engine server) =======================
include $(CLEAR_VARS)
@@ -550,8 +550,9 @@ LOCAL_DROIDDOC_CUSTOM_ASSET_DIR:=assets-sdk
include $(BUILD_DROIDDOC)
# explicitly specify that online-sdk depends on framework-res.
# explicitly specify that online-sdk depends on framework-res and any generated docs
$(full_target): framework-res-package-target
$(full_target): monkeyruner-docs-target
# ==== docs that have all of the stuff that's @hidden =======================
include $(CLEAR_VARS)