Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 053644db authored by Scott Main's avatar Scott Main Committed by Android (Google) Code Review
Browse files

Merge "add api level 17 to javadoc filter and update version number" into jb-mr1-dev

parents 59adf04a 1134de0f

Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -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