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

Commit b6961ffa authored Dec 07, 2016 by Paul Duffin Committed by android-build-merger Dec 07, 2016

Merge "Replace core-junit with junit" am: 6ac52937 am: a4d7100a

am: 9cb5f281

Change-Id: Ic5d35084e11387696997082f9c83ef25f543590b

parents cc8bbffb 9cb5f281

cmds/uiautomator/library/Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@ LOCAL_PATH:= $(call my-dir)

		uiautomator.core_src_files := $(call all-java-files-under, core-src) \
		$(call all-java-files-under, testrunner-src)
		uiautomator.core_java_libraries := android.test.runner core-junit
		uiautomator.core_java_libraries := android.test.runner junit

		uiautomator_internal_api_file := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/uiautomator_api.txt
		uiautomator_internal_removed_api_file := \

test-runner/Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@ include $(CLEAR_VARS)

		LOCAL_SRC_FILES := $(call all-java-files-under, src)

		LOCAL_JAVA_LIBRARIES := core-oj core-libart core-junit framework
		LOCAL_JAVA_LIBRARIES := core-oj core-libart junit framework
		LOCAL_STATIC_JAVA_LIBRARIES := junit-runner

		LOCAL_MODULE:= android.test.runner