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

Commit 89386704 authored by smain@google.com's avatar smain@google.com Committed by android-build-merger
Browse files

switch all API builds to use template-sdk instead of (soon to be deleted)... 

switch all API builds to use template-sdk instead of (soon to be deleted) templates-sdk-dev. also update all non-DAC builds to use the "referenceonly" flag for a cleaner output and faster build. am: 534bfe1a am: 63f29277 am: 7ed5e425
am: 3552190b

Change-Id: I40e7ef517807b0ba5cb9d60045a0125380b218e6
parents 812bd82c 3552190b

Android.mk

+12 −6
Original line number Diff line number Diff line
@@ -923,6 +923,7 @@ LOCAL_DROIDDOC_STUB_OUT_DIR := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES 


LOCAL_DROIDDOC_OPTIONS:=\

		$(framework_docs_LOCAL_DROIDDOC_OPTIONS) \

		-referenceonly \

		-api $(INTERNAL_PLATFORM_API_FILE) \

		-removedApi $(INTERNAL_PLATFORM_REMOVED_API_FILE) \

		-nodocs
@@ -956,6 +957,7 @@ LOCAL_DROIDDOC_STUB_OUT_DIR := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES 


LOCAL_DROIDDOC_OPTIONS:=\

		$(framework_docs_LOCAL_DROIDDOC_OPTIONS) \

		-referenceonly \

		-showAnnotation android.annotation.SystemApi \

		-api $(INTERNAL_PLATFORM_SYSTEM_API_FILE) \

		-removedApi $(INTERNAL_PLATFORM_SYSTEM_REMOVED_API_FILE) \
@@ -990,6 +992,7 @@ LOCAL_DROIDDOC_STUB_OUT_DIR := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES 


LOCAL_DROIDDOC_OPTIONS:=\

               $(framework_docs_LOCAL_DROIDDOC_OPTIONS) \

               -referenceonly \

               -stubs $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android_test_stubs_current_intermediates/src \

               -showAnnotation android.annotation.TestApi \

               -api $(INTERNAL_PLATFORM_TEST_API_FILE) \
@@ -1023,6 +1026,7 @@ LOCAL_MODULE := doc-comment-check 


LOCAL_DROIDDOC_OPTIONS:=\

		$(framework_docs_LOCAL_DROIDDOC_OPTIONS) \

		-referenceonly \

		-parsecomments



LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
@@ -1061,7 +1065,7 @@ LOCAL_DROIDDOC_OPTIONS:=\ 
		-sdkvalues $(OUT_DOCS) \

		-hdf android.whichdoc offline



LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev

LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk



include $(BUILD_DROIDDOC)
@@ -1098,7 +1102,7 @@ LOCAL_DROIDDOC_OPTIONS:=\ 
		-hdf android.whichdoc offline \

		-referenceonly



LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev

LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk



include $(BUILD_DROIDDOC)
@@ -1134,7 +1138,7 @@ LOCAL_DROIDDOC_OPTIONS:= \ 
		-hdf android.hasSamples true \

		-samplesdir $(samples_dir)



LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev

LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk



include $(BUILD_DROIDDOC)
@@ -1158,6 +1162,7 @@ LOCAL_MODULE := online-system-api-sdk 


LOCAL_DROIDDOC_OPTIONS:= \

		$(framework_docs_LOCAL_DROIDDOC_OPTIONS) \

		-referenceonly \

		-showAnnotation android.annotation.SystemApi \

		-title "Android SDK - Including system APIs." \

		-toroot / \
@@ -1201,7 +1206,7 @@ LOCAL_DROIDDOC_OPTIONS:= \ 
		-hdf android.hasSamples true \

		-samplesdir $(samples_dir)



LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev

LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk



include $(BUILD_DROIDDOC)
@@ -1229,7 +1234,7 @@ LOCAL_DROIDDOC_OPTIONS:= \ 
		-devsite \

		-ignoreJdLinks



LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev

LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk



include $(BUILD_DROIDDOC)
@@ -1258,7 +1263,7 @@ LOCAL_DROIDDOC_OPTIONS:= \ 
		-hdf android.hasSamples true \

		-samplesdir $(samples_dir)



LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev

LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk



include $(BUILD_DROIDDOC)
@@ -1277,6 +1282,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES:=$(framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES) 
LOCAL_MODULE := hidden

LOCAL_DROIDDOC_OPTIONS:=\

		$(framework_docs_LOCAL_DROIDDOC_OPTIONS) \

		-referenceonly \

		-title "Android SDK - Including hidden APIs."

#		-hidden