am ad7bce4c: Merge "DO NOT MERGE - Doclava warnings are now errors." into gingerbread

Merge commit 'ad7bce4ca236393cc2d9ab115cea5a267724f10c' into gingerbread-plus-aosp

* commit 'ad7bce4ca236393cc2d9ab115cea5a267724f10c':
  DO NOT MERGE - Doclava warnings are now errors.
This commit is contained in:
Joe Onorato
2010-09-16 11:49:39 -07:00
committed by Android Git Automerger

View File

@@ -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)