From 05461c0a465e8dec1bb79287aea3890464042281 Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Tue, 9 May 2017 19:01:09 -0600 Subject: [PATCH] Start building SystemApi docs again; exact output. Now that we've fixed the docs build we can enable it again. Also start using the new "-exactApi" feature to get a file with exactly the annotated APIs instead of a giant superset. (This makes it easier to compare diffs between releases.) Test: make update-api && make -j32 online-system-api-sdk-docs Bug: 38146029 Change-Id: Ib6d5d931f71ac4f50bf3223c25b50ed5765406a3 --- Android.mk | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Android.mk b/Android.mk index e58f30661fbcc..cd8a0241c356b 100644 --- a/Android.mk +++ b/Android.mk @@ -1062,6 +1062,7 @@ LOCAL_DROIDDOC_OPTIONS:=\ -showAnnotation android.annotation.SystemApi \ -api $(INTERNAL_PLATFORM_SYSTEM_API_FILE) \ -removedApi $(INTERNAL_PLATFORM_SYSTEM_REMOVED_API_FILE) \ + -exactApi $(INTERNAL_PLATFORM_SYSTEM_EXACT_API_FILE) \ -nodocs LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=external/doclava/res/assets/templates-sdk @@ -1098,6 +1099,7 @@ LOCAL_DROIDDOC_OPTIONS:=\ -showAnnotation android.annotation.TestApi \ -api $(INTERNAL_PLATFORM_TEST_API_FILE) \ -removedApi $(INTERNAL_PLATFORM_TEST_REMOVED_API_FILE) \ + -exactApi $(INTERNAL_PLATFORM_TEST_EXACT_API_FILE) \ -nodocs LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=external/doclava/res/assets/templates-sdk @@ -1251,8 +1253,6 @@ LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=external/doclava/res/assets/templates-sdk include $(BUILD_DROIDDOC) # ==== 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) LOCAL_SRC_FILES:=$(framework_docs_LOCAL_SRC_FILES) @@ -1283,11 +1283,10 @@ LOCAL_DROIDDOC_OPTIONS:= \ -samplesdir $(samples_dir) LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=external/doclava/res/assets/templates-sdk -# Don't build by default + LOCAL_UNINSTALLABLE_MODULE := true include $(BUILD_DROIDDOC) -endif # online-system-api-sdk-docs in make command line. # ==== docs for the web (on the devsite app engine server) ======================= include $(CLEAR_VARS)