Use LOCAL_ADDITIONAL_DEPENDENCIES instead of build system internals

Instead of directly adding dependencies to full_classes_compiled_jar
and full_classes_jack, just use LOCAL_ADDITIONAL_DEPENDENCIES and
let the build system take care of where the dependencies are needed.

Test: builds
Change-Id: Ia3078fe0aa54b2d69821a9879cfe43414e1e9c4f
This commit is contained in:
Colin Cross
2017-05-30 10:57:34 -07:00
parent 8e7057ccf3
commit 0b81f9727f

View File

@@ -64,10 +64,9 @@ include $(CLEAR_VARS)
LOCAL_MODULE := android_uiautomator
LOCAL_JAVA_LIBRARIES := $(uiautomator.core_java_libraries)
LOCAL_SOURCE_FILES_ALL_GENERATED := true
include $(BUILD_STATIC_JAVA_LIBRARY)
# Make sure to run droiddoc first to generate the stub source files.
$(full_classes_compiled_jar) : $(uiautomator_stubs_stamp)
$(built_dex_intermediate) : $(uiautomator_stubs_stamp)
LOCAL_ADDITIONAL_DEPENDENCIES := $(uiautomator_stubs_stamp)
include $(BUILD_STATIC_JAVA_LIBRARY)
###############################################
# API check