From eb09c6a98489c2f3738cedaada20282e052f9e86 Mon Sep 17 00:00:00 2001 From: Neil Fuller Date: Fri, 12 Feb 2016 15:38:34 +0000 Subject: [PATCH 1/2] Add flags needed to switch Jack to 1.8 for CTS targets When linking against .jack files that contain 1.8 language features Jack (currently) requires -D jack.java.source.version=1.8. "core-tests" includes 1.8 language features. Bug: 27113322 Bug: 26953739 (cherry-picked from commit 3269825f0be29ec8ea08e0b7930d801f3d0206b4) Change-Id: I294b50edb898699b57684eaf25016553338cb6a2 --- core/tests/systemproperties/Android.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/core/tests/systemproperties/Android.mk b/core/tests/systemproperties/Android.mk index 9f01a28fd332f..0c20876c65204 100644 --- a/core/tests/systemproperties/Android.mk +++ b/core/tests/systemproperties/Android.mk @@ -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 From dce343dc415ec890825044e77d99074129c05fb2 Mon Sep 17 00:00:00 2001 From: Neil Fuller Date: Mon, 15 Feb 2016 12:05:44 +0000 Subject: [PATCH 2/2] Add flags needed to switch Jack to 1.8 for CTS targets When linking against .jack files that contain 1.8 language features Jack (currently) requires -D jack.java.source.version=1.8. "core-tests" includes 1.8 language features. Bug: 27113322 Bug: 26953739 (cherry-picked from commit a835180b74af2cad853db08e8d41a7b04773759b) Change-Id: I2be4db6788b14558f74534c24bb007f7fb8b6b67 --- media/tests/MediaFrameworkTest/Android.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/media/tests/MediaFrameworkTest/Android.mk b/media/tests/MediaFrameworkTest/Android.mk index 42da48d0969b1..6fc624b483958 100644 --- a/media/tests/MediaFrameworkTest/Android.mk +++ b/media/tests/MediaFrameworkTest/Android.mk @@ -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