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

Commit 0f92a2e7 authored by Ying Wang's avatar Ying Wang
Browse files

Using LOCAL_DROIDDOC_STUB_OUT_DIR to specify "-stubs" option. 

So that the build system can clean up the stub out dir before
calling doclava.

Bug: 22534021
Change-Id: Iba33cf0a295e4ae32fdcad8bd326c2f52de5f875
parent bd366325

Android.mk

+4 −2
Original line number Diff line number Diff line
@@ -809,9 +809,10 @@ LOCAL_ADDITIONAL_DEPENDENCIES:=$(framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES) 


LOCAL_MODULE := api-stubs



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



LOCAL_DROIDDOC_OPTIONS:=\

		$(framework_docs_LOCAL_DROIDDOC_OPTIONS) \

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

		-api $(INTERNAL_PLATFORM_API_FILE) \

		-removedApi $(INTERNAL_PLATFORM_REMOVED_API_FILE) \

		-nodocs
@@ -841,9 +842,10 @@ LOCAL_ADDITIONAL_DEPENDENCIES:=$(framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES) 


LOCAL_MODULE := system-api-stubs



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



LOCAL_DROIDDOC_OPTIONS:=\

		$(framework_docs_LOCAL_DROIDDOC_OPTIONS) \

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

		-showAnnotation android.annotation.SystemApi \

		-api $(INTERNAL_PLATFORM_SYSTEM_API_FILE) \

		-removedApi $(INTERNAL_PLATFORM_SYSTEM_REMOVED_API_FILE) \

cmds/uiautomator/library/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -41,8 +41,9 @@ LOCAL_DROIDDOC_SOURCE_PATH := $(LOCAL_PATH)/core-src \ 
	$(LOCAL_PATH)/testrunner-src

LOCAL_DROIDDOC_HTML_DIR :=



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



LOCAL_DROIDDOC_OPTIONS:= \

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

    -stubpackages com.android.uiautomator.core:com.android.uiautomator.testrunner \

    -api $(uiautomator_internal_api_file) \

    -removedApi $(uiautomator_internal_removed_api_file)