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

Commit 01c560f4 authored Aug 24, 2016 by Guang Zhu

Avoid JUnit4 collision in android-support-test, mockito-target

Bug: 31072145
Test: make droid checkbuild

Change-Id: I1462b0ba70aa3ede1a5b2ccc407e234dea1eb1b2

parent d3ca5980

core/tests/coretests/Android.mk

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -30,7 +30,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
	guava \		guava \
	littlemock \		littlemock \
	android-support-test \		android-support-test \
	mockito-target \		mockito-target-minus-junit4 \
	espresso-core \		espresso-core \
	ub-uiautomator \		ub-uiautomator \
	platform-test-annotations		platform-test-annotations

core/tests/utiltests/Android.mk

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -14,7 +14,7 @@ LOCAL_SRC_FILES += src/android/util/IRemoteMemoryIntArray.aidl

	LOCAL_STATIC_JAVA_LIBRARIES := \		LOCAL_STATIC_JAVA_LIBRARIES := \
	android-support-test \		android-support-test \
	mockito-target		mockito-target-minus-junit4

	LOCAL_JAVA_LIBRARIES := android.test.runner		LOCAL_JAVA_LIBRARIES := android.test.runner

media/tests/MediaFrameworkTest/Android.mk

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -10,7 +10,7 @@ LOCAL_JAVA_LIBRARIES := android.test.runner
	LOCAL_JAVA_LANGUAGE_VERSION := 1.8		LOCAL_JAVA_LANGUAGE_VERSION := 1.8

	LOCAL_STATIC_JAVA_LIBRARIES := \		LOCAL_STATIC_JAVA_LIBRARIES := \
	mockito-target \		mockito-target-minus-junit4 \
	android-support-test \		android-support-test \
	android-ex-camera2		android-ex-camera2

services/tests/servicestests/Android.mk

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -21,7 +21,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
	services.usage \		services.usage \
	guava \		guava \
	android-support-test \		android-support-test \
	mockito-target \		mockito-target-minus-junit4 \
	ShortcutManagerTestUtils		ShortcutManagerTestUtils

	LOCAL_JAVA_LIBRARIES := android.test.runner		LOCAL_JAVA_LIBRARIES := android.test.runner

tests/Camera2Tests/CameraToo/tests/Android.mk

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -20,6 +20,6 @@ LOCAL_PACKAGE_NAME := CameraTooTests
	LOCAL_INSTRUMENTATION_FOR := CameraToo		LOCAL_INSTRUMENTATION_FOR := CameraToo
	LOCAL_SDK_VERSION := current		LOCAL_SDK_VERSION := current
	LOCAL_SRC_FILES := $(call all-java-files-under,src)		LOCAL_SRC_FILES := $(call all-java-files-under,src)
	LOCAL_STATIC_JAVA_LIBRARIES := android-support-test mockito-target		LOCAL_STATIC_JAVA_LIBRARIES := android-support-test mockito-target-minus-junit4

	include $(BUILD_PACKAGE)		include $(BUILD_PACKAGE)