Merge "Prepare for removal of legacy-test from default targets (Part 2)" am: 5a3a3d298a

am: a07f9d522b

Change-Id: I758123e58a78ac515fb4ed0ce8e1647cfd1a3dc8
This commit is contained in:
Paul Duffin
2017-01-24 16:12:57 +00:00
committed by android-build-merger

View File

@ -36,7 +36,7 @@ include $(BUILD_STATIC_JAVA_LIBRARY)
# Generate the stub source files # Generate the stub source files
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(uiautomator.core_src_files) LOCAL_SRC_FILES := $(uiautomator.core_src_files)
LOCAL_JAVA_LIBRARIES := $(uiautomator.core_java_libraries) LOCAL_JAVA_LIBRARIES := $(uiautomator.core_java_libraries) legacy-android-test
LOCAL_MODULE_CLASS := JAVA_LIBRARIES LOCAL_MODULE_CLASS := JAVA_LIBRARIES
LOCAL_DROIDDOC_SOURCE_PATH := $(LOCAL_PATH)/core-src \ LOCAL_DROIDDOC_SOURCE_PATH := $(LOCAL_PATH)/core-src \
$(LOCAL_PATH)/testrunner-src $(LOCAL_PATH)/testrunner-src