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

Commit 91572ab1 authored by Joe Fernandez's avatar Joe Fernandez Committed by android-build-merger
Browse files

am 2ba57444: Merge "docs: update Android docs build to include API 22, Android... 

am 2ba57444: Merge "docs: update Android docs build to include API 22, Android 5.1" into lmp-mr1-dev
automerge: 0a1d5ca4

* commit '0a1d5ca4':
  docs: update Android docs build to include API 22, Android 5.1
parents 0764a8b2 0a1d5ca4

Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -715,6 +715,7 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \ 
    -since $(SRC_API_DIR)/19.txt 19 \

    -since $(SRC_API_DIR)/20.txt 20 \

    -since $(SRC_API_DIR)/21.txt 21 \

    -since $(SRC_API_DIR)/22.txt 22 \

		-werror -hide 111 -hide 113 \

		-overview $(LOCAL_PATH)/core/java/overview.html
@@ -751,7 +752,7 @@ sample_groups := -samplegroup Admin \ 


## SDK version identifiers used in the published docs

  # major[.minor] version for current SDK. (full releases only)

framework_docs_SDK_VERSION:=4.4

framework_docs_SDK_VERSION:=5.1

  # release version (ie "Release x")  (full releases only)

framework_docs_SDK_REL_ID:=1