diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2010-08-31 15:11:45 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-31 15:11:45 -0700 |
| commit | e1cc0ffe54a7e961276d43e70988e69222907957 (patch) | |
| tree | ea3a874b6d14c1ccb18376b8da2cc3c540869fa3 /Android.mk | |
| parent | 1423f51ec5fe2c9bf5fa44866443b2c52db165be (diff) | |
| parent | 2053f91623821d6b34cf70edbc00e3a93e1a20c5 (diff) | |
| download | frameworks_base-e1cc0ffe54a7e961276d43e70988e69222907957.zip frameworks_base-e1cc0ffe54a7e961276d43e70988e69222907957.tar.gz frameworks_base-e1cc0ffe54a7e961276d43e70988e69222907957.tar.bz2 | |
Merge "Clean up doc build to use Android custom doclava."
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 11 |
1 files changed, 3 insertions, 8 deletions
@@ -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) |