summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dirk Dougherty <ddougherty@google.com> 2010-08-25 12:12:57 -0700
committer Dirk Dougherty <ddougherty@google.com> 2010-08-30 18:22:55 -0700
commit2053f91623821d6b34cf70edbc00e3a93e1a20c5 (patch)
tree485aaf874a0e53368d5ec78cdcb7353139dd98a3
parent47416bc4f9beb4147b29bb9d93653a4aa356c37d (diff)
Clean up doc build to use Android custom doclava.
Change-Id: I1dcf18054aa128ffb4c66111c53fad20bcdee783
-rw-r--r--Android.mk11
1 files changed, 3 insertions, 8 deletions
diff --git a/Android.mk b/Android.mk
index 1a299244d5a6..4ffba7cdd34c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -473,7 +473,6 @@ LOCAL_DROIDDOC_OPTIONS:=\
-nodocs
LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
-LOCAL_DROIDDOC_CUSTOM_ASSET_DIR:=assets-sdk
include $(BUILD_DROIDDOC)
@@ -502,7 +501,6 @@ LOCAL_DROIDDOC_OPTIONS:=\
-parsecomments
LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
-LOCAL_DROIDDOC_CUSTOM_ASSET_DIR:=assets-sdk
include $(BUILD_DROIDDOC)
@@ -532,14 +530,13 @@ LOCAL_DROIDDOC_OPTIONS:=\
-proofread $(OUT_DOCS)/$(LOCAL_MODULE)-proofread.txt \
-todo $(OUT_DOCS)/$(LOCAL_MODULE)-docs-todo.html \
-sdkvalues $(OUT_DOCS) \
- -hdf android.whichdoc offline
+ -hdf android.whichdoc offline
ifeq ($(framework_docs_SDK_PREVIEW),true)
LOCAL_DROIDDOC_OPTIONS += -hdf sdk.current preview
endif
LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
-LOCAL_DROIDDOC_CUSTOM_ASSET_DIR:=assets-sdk
include $(BUILD_DROIDDOC)
@@ -574,7 +571,6 @@ LOCAL_DROIDDOC_OPTIONS:= \
-hdf template.showLanguageMenu true
LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
-LOCAL_DROIDDOC_CUSTOM_ASSET_DIR:=assets-sdk
include $(BUILD_DROIDDOC)
@@ -595,11 +591,10 @@ LOCAL_ADDITIONAL_JAVA_DIR:=$(call intermediates-dir-for,JAVA_LIBRARIES,framework
LOCAL_MODULE := hidden
LOCAL_DROIDDOC_OPTIONS:=\
$(framework_docs_LOCAL_DROIDDOC_OPTIONS) \
- -title "Android SDK - Including hidden APIs."
-# -hidden
+ -title "Android SDK - Including hidden APIs."
+# -hidden
LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
-LOCAL_DROIDDOC_CUSTOM_ASSET_DIR:=assets-sdk
include $(BUILD_DROIDDOC)