From 0f92a2e72f1f1bb67a926420fc2e45e2ce607341 Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Thu, 16 Jul 2015 14:20:22 -0700 Subject: [PATCH] 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 --- Android.mk | 6 ++++-- cmds/uiautomator/library/Android.mk | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Android.mk b/Android.mk index ccbd9c91c1586..19fe2f72ad49e 100644 --- a/Android.mk +++ b/Android.mk @@ -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) \ diff --git a/cmds/uiautomator/library/Android.mk b/cmds/uiautomator/library/Android.mk index 2123f25e9202d..62fb0e4ca980f 100644 --- a/cmds/uiautomator/library/Android.mk +++ b/cmds/uiautomator/library/Android.mk @@ -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)