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

Commit 13a80432 authored by Scott Main's avatar Scott Main Committed by Android (Google) Code Review
Browse files

Merge "switch all droiddoc builds to use templates-sdk from doclava"

parents 15d10517 15b85174

Android.mk

+13 −13
Original line number Diff line number Diff line
@@ -1003,7 +1003,7 @@ LOCAL_DROIDDOC_OPTIONS:=\ 
		-removedApi $(INTERNAL_PLATFORM_REMOVED_API_FILE) \

		-nodocs



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

LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=external/doclava/res/assets/templates-sdk



LOCAL_UNINSTALLABLE_MODULE := true
@@ -1038,7 +1038,7 @@ LOCAL_DROIDDOC_OPTIONS:=\ 
		-removedApi $(INTERNAL_PLATFORM_SYSTEM_REMOVED_API_FILE) \

		-nodocs



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

LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=external/doclava/res/assets/templates-sdk



LOCAL_UNINSTALLABLE_MODULE := true
@@ -1074,7 +1074,7 @@ LOCAL_DROIDDOC_OPTIONS:=\ 
               -removedApi $(INTERNAL_PLATFORM_TEST_REMOVED_API_FILE) \

               -nodocs



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

LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=external/doclava/res/assets/templates-sdk



LOCAL_UNINSTALLABLE_MODULE := true
@@ -1104,7 +1104,7 @@ LOCAL_DROIDDOC_OPTIONS:=\ 
		-referenceonly \

		-parsecomments



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

LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=external/doclava/res/assets/templates-sdk



LOCAL_UNINSTALLABLE_MODULE := true
@@ -1140,7 +1140,7 @@ LOCAL_DROIDDOC_OPTIONS:=\ 
		-sdkvalues $(OUT_DOCS) \

		-hdf android.whichdoc offline



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

LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=external/doclava/res/assets/templates-sdk



include $(BUILD_DROIDDOC)
@@ -1179,7 +1179,7 @@ LOCAL_DROIDDOC_OPTIONS:=\ 
		-resourcesdir $(LOCAL_PATH)/docs/html/reference/images/ \

		-resourcesoutdir reference/android/images/



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

LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=external/doclava/res/assets/templates-sdk



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

		-samplesdir $(samples_dir)



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

LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=external/doclava/res/assets/templates-sdk



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

		-samplesdir $(samples_dir)



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

LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=external/doclava/res/assets/templates-sdk

# Don't build by default

LOCAL_UNINSTALLABLE_MODULE := true
@@ -1290,7 +1290,7 @@ LOCAL_DROIDDOC_OPTIONS:= \ 
		-hdf android.hasSamples true \

		-samplesdir $(samples_dir)



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

LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=external/doclava/res/assets/templates-sdk



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

		-ignoreJdLinks



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

LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=external/doclava/res/assets/templates-sdk



include $(BUILD_DROIDDOC)
@@ -1343,7 +1343,7 @@ LOCAL_DROIDDOC_OPTIONS:= \ 
		-atLinksNavtree \

		-navtreeonly



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

LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=external/doclava/res/assets/templates-sdk



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

		-samplesdir $(samples_dir)



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

LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=external/doclava/res/assets/templates-sdk



include $(BUILD_DROIDDOC)
@@ -1394,7 +1394,7 @@ LOCAL_DROIDDOC_OPTIONS:=\ 
		-title "Android SDK - Including hidden APIs."

#		-hidden



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

LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=external/doclava/res/assets/templates-sdk



include $(BUILD_DROIDDOC)