summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-08-03 12:01:55 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-08-03 12:01:55 -0700
commitfcc638dbba28f1804fb0f83b6f6964f8a408e4c9 (patch)
tree0c20aef8c6745c5da770989598caf95e87e6fd28 /Android.mk
parent7a17cf3418eb0cbd23804f51921b7dd66713ad03 (diff)
parent7a3e39cac812b6ec63fade9613bb0c1f04156fa0 (diff)
downloadframeworks_base-fcc638dbba28f1804fb0f83b6f6964f8a408e4c9.zip
frameworks_base-fcc638dbba28f1804fb0f83b6f6964f8a408e4c9.tar.gz
frameworks_base-fcc638dbba28f1804fb0f83b6f6964f8a408e4c9.tar.bz2
am 7a3e39ca: Merge change 9378 into donut
Merge commit '7a3e39cac812b6ec63fade9613bb0c1f04156fa0' * commit '7a3e39cac812b6ec63fade9613bb0c1f04156fa0': add "since" info for reference docs
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk6
1 files changed, 6 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 728ae46..275807a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -332,7 +332,13 @@ framework_docs_LOCAL_JAVA_LIBRARIES := \
framework_docs_LOCAL_MODULE_CLASS := JAVA_LIBRARIES
framework_docs_LOCAL_DROIDDOC_HTML_DIR := docs/html
+# The since flag (-since N.xml API_LEVEL) is used to add API Level information
+# to the reference documentation. Must be in order of oldest to newest.
framework_docs_LOCAL_DROIDDOC_OPTIONS := \
+ -since ./frameworks/base/api/1.xml 1 \
+ -since ./frameworks/base/api/2.xml 2 \
+ -since ./frameworks/base/api/3.xml 3 \
+ -since ./frameworks/base/api/current.xml Donut \
-error 1 -error 2 -warning 3 -error 4 -error 6 -error 8 \
-overview $(LOCAL_PATH)/core/java/overview.html