Merge "Remove .mk lines that are just setting the default" am: 8873c3821d am: 6a3c315b25

am: c611842e1c

Change-Id: Ib71490ac084c706b53ae83278f3f8fcd302fc0f2
This commit is contained in:
Neil Fuller
2016-10-06 08:49:37 +00:00
committed by android-build-merger
2 changed files with 0 additions and 3 deletions

View File

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

View File

@ -7,8 +7,6 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_JAVA_LIBRARIES := android.test.runner
LOCAL_JAVA_LANGUAGE_VERSION := 1.8
LOCAL_STATIC_JAVA_LIBRARIES := easymocklib \ LOCAL_STATIC_JAVA_LIBRARIES := easymocklib \
mockito-target \ mockito-target \
android-support-test \ android-support-test \