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

Merge "Start building SystemApi docs again; exact output." into oc-dev

Browse Source 
am: ab3c811678

Change-Id: I1b45a67f2bc3e76d09f29dc59bc9a6c9dcd3d3d5
This commit is contained in:
Jeff Sharkey
2017-05-10 16:10:45 +00:00
committed by android-build-merger
parent c8ae9d5a60 ab3c811678
commit e9e899f49b
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Android.mk
View File

@@ -1076,6 +1076,7 @@ LOCAL_DROIDDOC_OPTIONS:=\
-showAnnotation android.annotation.SystemApi \ -showAnnotation android.annotation.SystemApi \
-api $(INTERNAL_PLATFORM_SYSTEM_API_FILE) \ -api $(INTERNAL_PLATFORM_SYSTEM_API_FILE) \
-removedApi $(INTERNAL_PLATFORM_SYSTEM_REMOVED_API_FILE) \ -removedApi $(INTERNAL_PLATFORM_SYSTEM_REMOVED_API_FILE) \
-exactApi $(INTERNAL_PLATFORM_SYSTEM_EXACT_API_FILE) \
-nodocs -nodocs
LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=external/doclava/res/assets/templates-sdk LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=external/doclava/res/assets/templates-sdk
@@ -1112,6 +1113,7 @@ LOCAL_DROIDDOC_OPTIONS:=\
-showAnnotation android.annotation.TestApi \ -showAnnotation android.annotation.TestApi \
-api $(INTERNAL_PLATFORM_TEST_API_FILE) \ -api $(INTERNAL_PLATFORM_TEST_API_FILE) \
-removedApi $(INTERNAL_PLATFORM_TEST_REMOVED_API_FILE) \ -removedApi $(INTERNAL_PLATFORM_TEST_REMOVED_API_FILE) \
-exactApi $(INTERNAL_PLATFORM_TEST_EXACT_API_FILE) \
-nodocs -nodocs
LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=external/doclava/res/assets/templates-sdk LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=external/doclava/res/assets/templates-sdk
@@ -1265,8 +1267,6 @@ LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=external/doclava/res/assets/templates-sdk
include $(BUILD_DROIDDOC) include $(BUILD_DROIDDOC)
# ==== docs for the web (on the androiddevdocs app engine server) ======================= # ==== docs for the web (on the androiddevdocs app engine server) =======================
# TODO: Fix the System API docs build.
ifneq ($(filter online-system-api-sdk-docs,$(MAKECMDGOALS)),)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_SRC_FILES:=$(framework_docs_LOCAL_SRC_FILES) LOCAL_SRC_FILES:=$(framework_docs_LOCAL_SRC_FILES)
@@ -1297,11 +1297,10 @@ LOCAL_DROIDDOC_OPTIONS:= \
-samplesdir $(samples_dir) -samplesdir $(samples_dir)
LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=external/doclava/res/assets/templates-sdk LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=external/doclava/res/assets/templates-sdk
# Don't build by default
LOCAL_UNINSTALLABLE_MODULE := true LOCAL_UNINSTALLABLE_MODULE := true
include $(BUILD_DROIDDOC) include $(BUILD_DROIDDOC)
endif # online-system-api-sdk-docs in make command line.
# ==== docs for the web (on the devsite app engine server) ======================= # ==== docs for the web (on the devsite app engine server) =======================
include $(CLEAR_VARS) include $(CLEAR_VARS)