Merge "Enabled annotations for api-stubs, system-api-stubs, and test-api-stubs" into pi-dev (2f02e079) · Commits · e / os / android_frameworks_base

Android.mk

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -374,6 +374,9 @@ LOCAL_ADDITIONAL_DEPENDENCIES:=$(framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES)

	LOCAL_MODULE := metalava-api-stubs		LOCAL_MODULE := metalava-api-stubs
	LOCAL_DROIDDOC_USE_METALAVA := true		LOCAL_DROIDDOC_USE_METALAVA := true
			LOCAL_DROIDDOC_METALAVA_PREVIOUS_API := prebuilts/sdk/api/27.txt
			LOCAL_DROIDDOC_METALAVA_ANNOTATIONS_ENABLED := true
			LOCAL_DROIDDOC_METALAVA_MERGE_ANNOTATIONS_DIR := tools/metalava/manual

	LOCAL_DROIDDOC_STUB_OUT_DIR := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/metalava_android_stubs_current_intermediates/src		LOCAL_DROIDDOC_STUB_OUT_DIR := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/metalava_android_stubs_current_intermediates/src

	@@ -445,6 +448,9 @@ LOCAL_ADDITIONAL_DEPENDENCIES:=$(framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES)

	LOCAL_MODULE := metalava-system-api-stubs		LOCAL_MODULE := metalava-system-api-stubs
	LOCAL_DROIDDOC_USE_METALAVA := true		LOCAL_DROIDDOC_USE_METALAVA := true
			LOCAL_DROIDDOC_METALAVA_PREVIOUS_API := prebuilts/sdk/api/27.txt
			LOCAL_DROIDDOC_METALAVA_ANNOTATIONS_ENABLED := true
			LOCAL_DROIDDOC_METALAVA_MERGE_ANNOTATIONS_DIR := tools/metalava/manual

	LOCAL_DROIDDOC_STUB_OUT_DIR := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/metalava_android_system_stubs_current_intermediates/src		LOCAL_DROIDDOC_STUB_OUT_DIR := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/metalava_android_system_stubs_current_intermediates/src

	@@ -518,6 +524,9 @@ LOCAL_ADDITIONAL_DEPENDENCIES:=$(framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES)

	LOCAL_MODULE := metalava-test-api-stubs		LOCAL_MODULE := metalava-test-api-stubs
	LOCAL_DROIDDOC_USE_METALAVA := true		LOCAL_DROIDDOC_USE_METALAVA := true
			LOCAL_DROIDDOC_METALAVA_PREVIOUS_API := prebuilts/sdk/api/27.txt
			LOCAL_DROIDDOC_METALAVA_ANNOTATIONS_ENABLED := true
			LOCAL_DROIDDOC_METALAVA_MERGE_ANNOTATIONS_DIR := tools/metalava/manual

	LOCAL_DROIDDOC_STUB_OUT_DIR := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/metalava_android_test_stubs_current_intermediates/src		LOCAL_DROIDDOC_STUB_OUT_DIR := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/metalava_android_test_stubs_current_intermediates/src