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

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

Merge "add api level 16 flag for droiddoc filtering and update version code"

parents d1148756 a7c03721
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -411,6 +411,7 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \
    -since ./frameworks/base/api/13.xml 13 \
    -since ./frameworks/base/api/14.txt 14 \
    -since ./frameworks/base/api/15.txt 15 \
    -since ./frameworks/base/api/16.txt 16 \
		-werror -hide 113 \
		-overview $(LOCAL_PATH)/core/java/overview.html

@@ -521,7 +522,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.0
framework_docs_SDK_VERSION:=4.1
  # release version (ie "Release x")  (full releases only)
framework_docs_SDK_REL_ID:=1