summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Onorato <joeo@google.com>2010-09-16 11:45:34 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-09-16 11:45:34 -0700
commitad7bce4ca236393cc2d9ab115cea5a267724f10c (patch)
treec860cd17ebcc955072488104772f0d058bf0767b
parenta7f5e476d54e6f7da588909d370580c3e3457e9b (diff)
parentb9f03d51c2d727a6bdcdd0b781e8dbe1ca34c2f7 (diff)
downloadframeworks_base-ad7bce4ca236393cc2d9ab115cea5a267724f10c.zip
frameworks_base-ad7bce4ca236393cc2d9ab115cea5a267724f10c.tar.gz
frameworks_base-ad7bce4ca236393cc2d9ab115cea5a267724f10c.tar.bz2
Merge "DO NOT MERGE - Doclava warnings are now errors." into gingerbread
-rw-r--r--Android.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index 9f67be9..06a589c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -361,8 +361,8 @@ 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 \
- -error 1 -error 2 -warning 3 -error 4 -error 6 -error 8 -error 14 \
- -overview $(LOCAL_PATH)/core/java/overview.html
+ -werror -hide 13 \
+ -overview $(LOCAL_PATH)/core/java/overview.html
framework_docs_LOCAL_ADDITIONAL_JAVA_DIR:= $(call intermediates-dir-for,JAVA_LIBRARIES,framework)