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

Commit b7bea999 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

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

am: e9e899f4

Change-Id: Ie0ef290e1b032f99cc76ab66e4999132b38d4cb3
parents c5eb0d22 e9e899f4

Android.mk

+3 −4
Original line number Original line Diff line number Diff line
@@ -1090,6 +1090,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
@@ -1126,6 +1127,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
@@ -1279,8 +1281,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)
@@ -1311,11 +1311,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)