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

Commit 1f87f1e9 authored by Neil Fuller's avatar Neil Fuller Committed by android-build-merger
Browse files

Merge changes from topic \'java_util_function_tests\' 

am: 6b502075

* commit '6b502075':
  Add flags needed to switch Jack to 1.8 for CTS targets
  Add flags needed to switch Jack to 1.8 for CTS targets
parents bd45c084 6b502075

core/tests/systemproperties/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ LOCAL_DX_FLAGS := --core-library 
LOCAL_STATIC_JAVA_LIBRARIES := core-tests 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

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files) 
LOCAL_JAVA_LIBRARIES := android.test.runner



LOCAL_STATIC_JAVA_LIBRARIES := easymocklib mockito-target core-tests android-support-test

LOCAL_JAVA_LANGUAGE_VERSION := 1.8



LOCAL_PACKAGE_NAME := mediaframeworktest