Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move the resourcesdir option to the global options so that all doc builds put framework images in the right place."

Browse Source
This commit is contained in:
Scott Main
2017-03-21 23:04:01 +00:00
committed by Android (Google) Code Review
parent d85bf7857d f8cdfc8754
commit 229ce70127
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Android.mk
View File

@@ -993,11 +993,13 @@ framework_docs_SDK_REL_ID:=1
framework_docs_LOCAL_DROIDDOC_OPTIONS += \
-hdf dac true \
-hdf sdk.codename N \
-hdf sdk.preview.version 5 \
-hdf sdk.codename O \
-hdf sdk.preview.version 1 \
-hdf sdk.version $(framework_docs_SDK_VERSION) \
-hdf sdk.rel.id $(framework_docs_SDK_REL_ID) \
-hdf sdk.preview 0
-hdf sdk.preview 0 \
-resourcesdir $(LOCAL_PATH)/docs/html/reference/images/ \
-resourcesoutdir reference/android/images/
# ==== the api stubs and current.xml ===========================
include $(CLEAR_VARS)
@@ -1194,9 +1196,7 @@ LOCAL_DROIDDOC_OPTIONS:=\
-proofread $(OUT_DOCS)/$(LOCAL_MODULE)-proofread.txt \
-sdkvalues $(OUT_DOCS) \
-hdf android.whichdoc offline \
-referenceonly \
-resourcesdir $(LOCAL_PATH)/docs/html/reference/images/ \
-resourcesoutdir reference/android/images/
-referenceonly
LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=external/doclava/res/assets/templates-sdk