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

Commit 229ce701 authored by Scott Main's avatar Scott Main Committed by Android (Google) Code Review
Browse files

Merge "Move the resourcesdir option to the global options so that all doc... 

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

Android.mk

+6 −6
Original line number Diff line number Diff line
@@ -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