summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2012-09-28 12:09:59 -0700
committerScott Main <smain@google.com>2012-09-28 12:12:59 -0700
commit1134de0f1223d93f84b4475e74e934f1bd68f634 (patch)
tree33829ed151a26f653c05c03995f6f33f62ef78e4 /Android.mk
parent10a2979e551243f337e4ae1a2951c282546c7433 (diff)
downloadframeworks_base-1134de0f1223d93f84b4475e74e934f1bd68f634.zip
frameworks_base-1134de0f1223d93f84b4475e74e934f1bd68f634.tar.gz
frameworks_base-1134de0f1223d93f84b4475e74e934f1bd68f634.tar.bz2
add api level 17 to javadoc filter and update version number
Change-Id: I278f796b3390e57f4309f215e4f37359a80f0e83
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index be98487..d38150f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -429,6 +429,7 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \
-since ./frameworks/base/api/14.txt 14 \
-since ./frameworks/base/api/15.txt 15 \
-since ./frameworks/base/api/16.txt 16 \
+ -since ./frameworks/base/api/17.txt 17 \
-werror -hide 113 \
-overview $(LOCAL_PATH)/core/java/overview.html
@@ -539,7 +540,7 @@ web_docs_sample_code_flags := \
## SDK version identifiers used in the published docs
# major[.minor] version for current SDK. (full releases only)
-framework_docs_SDK_VERSION:=4.1
+framework_docs_SDK_VERSION:=4.2
# release version (ie "Release x") (full releases only)
framework_docs_SDK_REL_ID:=1