drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Adjust root path for translated content dirs on devsite builds." into mnc-mr-docs

Browse Source 
am: face65fe16

* commit 'face65fe16294e7e9406c18b4dce96f6a9c8594d':
  Adjust root path for translated content dirs on devsite builds.

Change-Id: I27ea20a3ea7e0e854a4e22823a4c17c336549a53
This commit is contained in:
Dirk Dougherty
2016-04-22 07:23:24 +00:00
committed by android-build-merger
parent 2a7de38fca face65fe16
commit eeee5e2ec9
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Android.mk
View File

@ -1041,17 +1041,20 @@ LOCAL_DROIDDOC_HTML_DIR:=$(framework_docs_LOCAL_DROIDDOC_HTML_DIR)
LOCAL_ADDITIONAL_JAVA_DIR:=$(framework_docs_LOCAL_ADDITIONAL_JAVA_DIR) LOCAL_ADDITIONAL_JAVA_DIR:=$(framework_docs_LOCAL_ADDITIONAL_JAVA_DIR)
LOCAL_ADDITIONAL_DEPENDENCIES:=$(framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES) LOCAL_ADDITIONAL_DEPENDENCIES:=$(framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES)
# specify a second html input dir and an output path relative to OUT_DIR) # 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_MODULE := ds
LOCAL_DROIDDOC_OPTIONS:= \ LOCAL_DROIDDOC_OPTIONS:= \
$(framework_docs_LOCAL_DROIDDOC_OPTIONS) \ $(framework_docs_LOCAL_DROIDDOC_OPTIONS) \
-devsite \ -devsite \
-hdf devsite true \
-toroot / \ -toroot / \
-hdf android.whichdoc online \ -hdf android.whichdoc online \
$(sample_groups) \
-useUpdatedTemplates \ -useUpdatedTemplates \
-hdf devsite true -hdf android.hasSamples true \
-samplesdir $(samples_dir)
LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev