Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d426ef6 authored by Dirk Dougherty's avatar Dirk Dougherty Committed by Android Git Automerger
Browse files

am 3256aeed: am 61101eee: am e27f64b0: am 1417357e: am f8a9c509: am 7b32d32b:... 

am 3256aeed: am 61101eee: am e27f64b0: am 1417357e: am f8a9c509: am 7b32d32b: Merge "Add build rule for ds (devsite) online docs." into jb-mr1-dev

# Via Android Git Automerger (5) and others
* commit '3256aeed':
  Add build rule for ds (devsite) online docs.
parents e16e80a4 3256aeed

Android.mk

+31 −1
Original line number Diff line number Diff line
@@ -671,7 +671,7 @@ $(static_doc_index_redirect): \ 
$(full_target): $(static_doc_index_redirect)

$(full_target): $(framework_built)



# ==== docs for the web (on the google app engine server) =======================

# ==== docs for the web (on the androiddevdocs app engine server) =======================

include $(CLEAR_VARS)



LOCAL_SRC_FILES:=$(framework_docs_LOCAL_SRC_FILES)
@@ -700,6 +700,36 @@ include $(BUILD_DROIDDOC) 
# explicitly specify that online-sdk depends on framework-res and any generated docs

$(full_target): framework-res-package-target



# ==== docs for the web (on the devsite app engine server) =======================

include $(CLEAR_VARS)

LOCAL_SRC_FILES:=$(framework_docs_LOCAL_SRC_FILES)

LOCAL_INTERMEDIATE_SOURCES:=$(framework_docs_LOCAL_INTERMEDIATE_SOURCES)

LOCAL_STATIC_JAVA_LIBRARIES:=$(framework_docs_LOCAL_STATIC_JAVA_LIBRARIES)

LOCAL_JAVA_LIBRARIES:=$(framework_docs_LOCAL_JAVA_LIBRARIES)

LOCAL_MODULE_CLASS:=$(framework_docs_LOCAL_MODULE_CLASS)

LOCAL_DROIDDOC_SOURCE_PATH:=$(framework_docs_LOCAL_DROIDDOC_SOURCE_PATH)

LOCAL_DROIDDOC_HTML_DIR:=$(framework_docs_LOCAL_DROIDDOC_HTML_DIR)

LOCAL_ADDITIONAL_JAVA_DIR:=$(framework_docs_LOCAL_ADDITIONAL_JAVA_DIR)

LOCAL_ADDITIONAL_DEPENDENCIES:=$(framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES)

# specify a second html input dir and an output path relative to OUT_DIR)

LOCAL_ADDITIONAL_HTML_DIR:=docs/html-intl /



LOCAL_MODULE := ds



LOCAL_DROIDDOC_OPTIONS:= \

		$(framework_docs_LOCAL_DROIDDOC_OPTIONS) \

		$(web_docs_sample_code_flags) \

		-devsite \

		-toroot / \

		-hdf android.whichdoc online



LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-ds



include $(BUILD_DROIDDOC)



# explicitly specify that ds depends on framework-res and any generated docs

$(full_target): framework-res-package-target



# ==== docs that have all of the stuff that's @hidden =======================

include $(CLEAR_VARS)