Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 66b4366e: am a2bbdb96: am 2ba57444: Merge "docs: update Android docs build to include API 22, Android 5.1" into lmp-mr1-dev

Browse Source 
* commit '66b4366e99f561766303e539d3ee798a0b8a2a09':
  docs: update Android docs build to include API 22, Android 5.1
This commit is contained in:
Joe Fernandez
2015-03-03 02:00:51 +00:00
committed by Android Git Automerger
parent e54ab91fff 66b4366e99
commit f76b6c988a
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Android.mk
View File

@@ -716,6 +716,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
@@ -752,7 +753,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