Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic \'java_util_function_tests\'

Browse Source 
am: 6b50207596

* commit '6b5020759651d1ed4d9f25ce3ab1e7c360b02fe7':
  Add flags needed to switch Jack to 1.8 for CTS targets
  Add flags needed to switch Jack to 1.8 for CTS targets
This commit is contained in:
Neil Fuller
2016-02-19 10:34:14 +00:00
committed by android-build-merger
parent bd45c08468 6b50207596
commit 1f87f1e971
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/tests/systemproperties/Android.mk
View File

@@ -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

1
media/tests/MediaFrameworkTest/Android.mk
View File

@@ -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