diff options
| author | 2016-04-22 07:15:53 +0000 | |
|---|---|---|
| committer | 2016-04-22 07:15:54 +0000 | |
| commit | face65fe16294e7e9406c18b4dce96f6a9c8594d (patch) | |
| tree | 076d4916ce704acf6a3edffcef1acc7ca9410266 | |
| parent | 5ecc2aaee809ffc1691dabd51b3961a4d439fdd1 (diff) | |
| parent | 3852c1fd01c4b2224f07a4d6f64aff86612879be (diff) | |
Merge "Adjust root path for translated content dirs on devsite builds." into mnc-mr-docs
| -rw-r--r-- | Android.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk index 7e42edded048..a03ab290902e 100644 --- a/Android.mk +++ b/Android.mk @@ -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_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 \ + $(sample_groups) \ -useUpdatedTemplates \ - -hdf devsite true + -hdf android.hasSamples true \ + -samplesdir $(samples_dir) LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev |