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

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

Browse Source 
* commit '2a4f71df86e42f14705df452b74358e0b7970815':
  Temporarily disable sample code html generation in docs builds.
This commit is contained in:
Dirk Dougherty
2013-08-22 10:08:08 -07:00
committed by Android Git Automerger
parent 1b3f1533ce 2a4f71df86
commit de525b442f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Android.mk
View File

@@ -654,13 +654,13 @@ LOCAL_MODULE := offline-sdk
LOCAL_DROIDDOC_OPTIONS:=\ LOCAL_DROIDDOC_OPTIONS:=\
$(framework_docs_LOCAL_DROIDDOC_OPTIONS) \ $(framework_docs_LOCAL_DROIDDOC_OPTIONS) \
$(web_docs_sample_code_flags) \ -offlinemode \
-offlinemode \
-title "Android SDK" \ -title "Android SDK" \
-proofread $(OUT_DOCS)/$(LOCAL_MODULE)-proofread.txt \ -proofread $(OUT_DOCS)/$(LOCAL_MODULE)-proofread.txt \
-todo $(OUT_DOCS)/$(LOCAL_MODULE)-docs-todo.html \ -todo $(OUT_DOCS)/$(LOCAL_MODULE)-docs-todo.html \
-sdkvalues $(OUT_DOCS) \ -sdkvalues $(OUT_DOCS) \
-hdf android.whichdoc offline -hdf android.whichdoc offline
# $(web_docs_sample_code_flags)
LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
@@ -696,7 +696,7 @@ LOCAL_DROIDDOC_OPTIONS:= \
$(framework_docs_LOCAL_DROIDDOC_OPTIONS) \ $(framework_docs_LOCAL_DROIDDOC_OPTIONS) \
-toroot / \ -toroot / \
-hdf android.whichdoc online -hdf android.whichdoc online
# $(web_docs_sample_code_flags) # $(web_docs_sample_code_flags)
LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
@@ -720,11 +720,11 @@ LOCAL_MODULE := ds
LOCAL_DROIDDOC_OPTIONS:= \ LOCAL_DROIDDOC_OPTIONS:= \
$(framework_docs_LOCAL_DROIDDOC_OPTIONS) \ $(framework_docs_LOCAL_DROIDDOC_OPTIONS) \
$(web_docs_sample_code_flags) \
-devsite \ -devsite \
-toroot / \ -toroot / \
-hdf android.whichdoc online \ -hdf android.whichdoc online \
-hdf devsite true -hdf devsite true
# $(web_docs_sample_code_flags)
LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk