diff options
| author | 2016-04-26 23:54:24 -0700 | |
|---|---|---|
| committer | 2016-04-27 10:44:43 -0700 | |
| commit | d9036ba7ef9905959dc031397bbf75b6f5968eb9 (patch) | |
| tree | c9a0d813f93f0ca6b1bc4ee39f323e9f8a588aed | |
| parent | 6f8a10bd14d927f9603823c06a3e53f56392ba95 (diff) | |
| parent | 0d00d287a54ca79272899408800927cf563bd71a (diff) | |
resolve merge conflicts of 0d00d28 to nyc-dev
Change-Id: Ib922635fe200a4216ce2970660daf3105d521cc9
| -rw-r--r-- | Android.mk | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/Android.mk b/Android.mk index 7d7aa48067d1..2cfc9a220be1 100644 --- a/Android.mk +++ b/Android.mk @@ -1142,50 +1142,54 @@ 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/intl / +LOCAL_ADDITIONAL_HTML_DIR:=docs/html-intl / LOCAL_MODULE := ds LOCAL_DROIDDOC_OPTIONS:= \ $(framework_docs_LOCAL_DROIDDOC_OPTIONS) \ -devsite \ + -hdf devsite true \ -toroot / \ -hdf android.whichdoc online \ - -hdf devsite true + $(sample_groups) \ + -useUpdatedTemplates \ + -hdf android.hasSamples true \ + -samplesdir $(samples_dir) -LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev include $(BUILD_DROIDDOC) -# ==== docs for the ndk ======================= +# ==== site updates for docs (on the androiddevdocs 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:=docs/html-ndk +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/intl / +LOCAL_ADDITIONAL_HTML_DIR:=docs/html-intl / -LOCAL_MODULE := online-ndk +LOCAL_MODULE := online-sdk-dev LOCAL_DROIDDOC_OPTIONS:= \ $(framework_docs_LOCAL_DROIDDOC_OPTIONS) \ -toroot / \ -hdf android.whichdoc online \ $(sample_groups) \ + -useUpdatedTemplates \ -hdf android.hasSamples true \ -samplesdir $(samples_dir) -LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev include $(BUILD_DROIDDOC) - # ==== docs that have all of the stuff that's @hidden ======================= include $(CLEAR_VARS) |