summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Onorato <joeo@google.com>2010-09-10 12:45:18 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-09-10 12:45:18 -0700
commit81fe092d11607912944a49c47df6c14e28a977b8 (patch)
tree17d5b6132b66802de747fbe36669c5cdbec54ca8
parent7c8258d064efe70e8551480eaafd7296f659acd5 (diff)
parente94f6db17748abd979204179ccf1ed1c514ebe47 (diff)
downloadframeworks_base-81fe092d11607912944a49c47df6c14e28a977b8.zip
frameworks_base-81fe092d11607912944a49c47df6c14e28a977b8.tar.gz
frameworks_base-81fe092d11607912944a49c47df6c14e28a977b8.tar.bz2
Merge "Make @deprecated without a comment an error DO NOT MERGE" into gingerbread
-rw-r--r--Android.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index 4e77679..29c8cb4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -360,7 +360,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 \
- -error 1 -error 2 -warning 3 -error 4 -error 6 -error 8 \
+ -error 1 -error 2 -warning 3 -error 4 -error 6 -error 8 -error 14 \
-overview $(LOCAL_PATH)/core/java/overview.html
framework_docs_LOCAL_ADDITIONAL_JAVA_DIR:=$(call intermediates-dir-for,JAVA_LIBRARIES,framework)