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

Commit 978ec174 authored by Dirk Dougherty's avatar Dirk Dougherty Committed by Android Git Automerger
Browse files

am de525b44: am 2a4f71df: Merge "Temporarily disable sample code html...

am de525b44: am 2a4f71df: Merge "Temporarily disable sample code html generation in docs builds." into jb-mr2-docs

* commit 'de525b44':
  Temporarily disable sample code html generation in docs builds.
parents fdc3c0ef de525b44
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -656,13 +656,13 @@ LOCAL_MODULE := offline-sdk

LOCAL_DROIDDOC_OPTIONS:=\
		$(framework_docs_LOCAL_DROIDDOC_OPTIONS) \
                $(web_docs_sample_code_flags) \
		-offlinemode \
		-title "Android SDK" \
		-proofread $(OUT_DOCS)/$(LOCAL_MODULE)-proofread.txt \
		-todo $(OUT_DOCS)/$(LOCAL_MODULE)-docs-todo.html \
		-sdkvalues $(OUT_DOCS) \
		-hdf android.whichdoc offline
#		$(web_docs_sample_code_flags)


LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
@@ -722,11 +722,11 @@ LOCAL_MODULE := ds

LOCAL_DROIDDOC_OPTIONS:= \
		$(framework_docs_LOCAL_DROIDDOC_OPTIONS) \
		$(web_docs_sample_code_flags) \
		-devsite \
		-toroot / \
		-hdf android.whichdoc online \
		-hdf devsite true
#		$(web_docs_sample_code_flags)

LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk