summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Howard <showard@google.com>2010-09-16 13:56:25 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-16 13:56:25 -0700
commit03e47fc87cd17a3d430da45bdffccd37b4e83b26 (patch)
tree38cd53874e1bc8ec274da4cb4fa737ca7524c7ad
parent0b576506664d836bccc2782863b953e5c39d69d0 (diff)
parent552faebea6310fef89b5e648891f3e11258aeec5 (diff)
downloadframeworks_base-03e47fc87cd17a3d430da45bdffccd37b4e83b26.zip
frameworks_base-03e47fc87cd17a3d430da45bdffccd37b4e83b26.tar.gz
frameworks_base-03e47fc87cd17a3d430da45bdffccd37b4e83b26.tar.bz2
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base
-rw-r--r--Android.mk3
1 files changed, 1 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index 87bde71..a3d5e81 100644
--- a/Android.mk
+++ b/Android.mk
@@ -366,8 +366,7 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \
-since ./frameworks/base/api/7.xml 7 \
-since ./frameworks/base/api/8.xml 8 \
-since ./frameworks/base/api/current.xml HC \
- -error 101 -error 102 -warning 103 -error 104 -error 106 -error 108 -warning 113 \
- -error 114 \
+ -werror -hide 113 \
-overview $(LOCAL_PATH)/core/java/overview.html
framework_docs_LOCAL_ADDITIONAL_JAVA_DIR:= $(call intermediates-dir-for,JAVA_LIBRARIES,framework)