Merge "Adjust services robotest makefile" (8362c6d2) · Commits · e / os / android_frameworks_base

services/robotests/Android.mk

+4 −6

Original line number	Original line	Diff line number	Diff line
	@@ -26,13 +26,8 @@ LOCAL_MODULE_TAGS := optional
	LOCAL_PRIVILEGED_MODULE := true		LOCAL_PRIVILEGED_MODULE := true

	LOCAL_STATIC_JAVA_LIBRARIES := \		LOCAL_STATIC_JAVA_LIBRARIES := \
	frameworks-base-testutils \
	services.backup \		services.backup \
	services.core \		services.core
	android-support-test \
	mockito-target-minus-junit4 \
	platform-test-annotations \
	truth-prebuilt

	include $(BUILD_PACKAGE)		include $(BUILD_PACKAGE)

	@@ -45,6 +40,9 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)

	# Include the testing libraries (JUnit4 + Robolectric libs).		# Include the testing libraries (JUnit4 + Robolectric libs).
	LOCAL_STATIC_JAVA_LIBRARIES := \		LOCAL_STATIC_JAVA_LIBRARIES := \
			android-support-test \
			mockito-robolectric-prebuilt \
			platform-test-annotations \
	truth-prebuilt		truth-prebuilt

	LOCAL_JAVA_LIBRARIES := \		LOCAL_JAVA_LIBRARIES := \