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

Commit b0ed2aa0 authored Oct 06, 2016 by Neil Fuller

resolve merge conflicts of 3649f7cb to master

Change-Id: Ic16950f1c50f7d06d3c9ae08a6f28e292b89c20f

parents 7e78a0e3 3649f7cb

core/tests/systemproperties/Android.mk

+0 −1

Original line number	Diff line number	Diff line
		@@ -11,7 +11,6 @@ LOCAL_SRC_FILES := \
		LOCAL_STATIC_JAVA_LIBRARIES := android-common frameworks-core-util-lib
		LOCAL_JAVA_LIBRARIES := android.test.runner
		LOCAL_PACKAGE_NAME := FrameworksCoreSystemPropertiesTests
		LOCAL_JAVA_LANGUAGE_VERSION := 1.8

		LOCAL_CERTIFICATE := platform

media/tests/MediaFrameworkTest/Android.mk

+0 −2

Original line number	Diff line number	Diff line
		@@ -7,8 +7,6 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files)

		LOCAL_JAVA_LIBRARIES := android.test.runner

		LOCAL_JAVA_LANGUAGE_VERSION := 1.8

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