summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Scott Main <smain@google.com> 2010-10-18 18:58:06 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-10-18 18:58:06 -0700
commit494ec19efb8e7a600079966e52db6cd7a027ffd6 (patch)
tree48a3257460d6dac4f336f884e351cd273aa5ca90
parent69a19fdbff6aff8875d87e27c9b1047d0a3f44c1 (diff)
parent453c6d449b6469dde9aae6044dedfe3be0da76c5 (diff)
am 453c6d44: add api level 9 \'since\' flag to docs
Merge commit '453c6d449b6469dde9aae6044dedfe3be0da76c5' into gingerbread-plus-aosp * commit '453c6d449b6469dde9aae6044dedfe3be0da76c5': add api level 9 'since' flag to docs
-rw-r--r--Android.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index ab30c6e9af8b..941cf85de762 100644
--- a/Android.mk
+++ b/Android.mk
@@ -373,6 +373,7 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \
-since ./frameworks/base/api/6.xml 6 \
-since ./frameworks/base/api/7.xml 7 \
-since ./frameworks/base/api/8.xml 8 \
+ -since ./frameworks/base/api/9.xml 9 \
-werror -hide 13 \
-overview $(LOCAL_PATH)/core/java/overview.html
@@ -525,7 +526,7 @@ 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.preview true