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

Commit e9e899f4 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

Change-Id: I1b45a67f2bc3e76d09f29dc59bc9a6c9dcd3d3d5
parents c8ae9d5a ab3c8116

Android.mk

+3 −4
Original line number Diff line number Diff line
@@ -1076,6 +1076,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
@@ -1112,6 +1113,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
@@ -1265,8 +1267,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)
@@ -1297,11 +1297,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)