commit fec151053b5245c3277ff0e83f21b73e106c35f0
author Neil Fuller <nfuller@google.com> Mon Feb 15 11:26:54 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Feb 15 11:26:54 2016 +0000
tree eaf0af1881fb112095ba638de5a3026d8ce0ac54
parent 4e8bbd23e5d6663efdeba32d10447481096821b8
parent 7c24d565b2edcb2111b8dbd75729496c351f7d5b

Merge "Add flags needed to switch Jack to 1.8 for CTS targets" into nyc-dev am: 9c6827c017
am: 7c24d565b2

* commit '7c24d565b2edcb2111b8dbd75729496c351f7d5b':
  Add flags needed to switch Jack to 1.8 for CTS targets

core/tests/systemproperties/Android.mk

diff --git a/core/tests/systemproperties/Android.mk b/core/tests/systemproperties/Android.mk
index 9f01a28..0c20876 100644
--- a/core/tests/systemproperties/Android.mk
+++ b/core/tests/systemproperties/Android.mk
@@ -12,6 +12,7 @@
 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