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

am bc2b0529: resolved conflicts for merge of 4d329a8f to klp-modular-dev-plus-aosp

Browse Source 
* commit 'bc2b05299d5fb369aa5c912ccad8e8e3ade06d90':
  add API reference docs filtering for level 20
This commit is contained in:
Robert Ly
2014-06-30 01:03:52 +00:00
committed by Android Git Automerger
parent 9c5ac7aef1 bc2b05299d
commit 3d19bf1df3
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

@@ -645,7 +645,8 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \
-since $(SRC_API_DIR)/17.txt 17 \
-since $(SRC_API_DIR)/18.txt 18 \
-since $(SRC_API_DIR)/19.txt 19 \
-werror -hide 111 -hide 113 \
-since $(SRC_API_DIR)/20.txt 20 \
-werror -hide 113 \
-overview $(LOCAL_PATH)/core/java/overview.html
framework_docs_LOCAL_API_CHECK_ADDITIONAL_JAVA_DIR:= \