commit 1b70a229c444d3e893e6309e5191bb205fb1dcef
author Tobias Thierer <tobiast@google.com> Wed May 24 11:44:04 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed May 24 11:44:04 2017 +0000
tree 726127ad354721e1d792709909b87c7cd5f8ea4e
parent 8a550803cd840dfb728a7e9f5a482e7dd8417fee
parent b4a41eef0c0a269ed44231dd1cb1cbaa1d022314

Merge "EmailTests: Use language level consistent with SDK version." am: 1239cd59a0 am: dfa906a0fe
am: b4a41eef0c

Change-Id: I8e621f7e16d0839817f66a202b47a039ed2bbb1a

tests/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index 12fbdc7..5598c2e 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -26,6 +26,10 @@
 
 LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
 
+# For LOCAL_JAVA_LANGUAGE_VERSION >= 1.7, OpenJDK 9 javac generates synthetic calls to
+# Objects.requireNonNull() which was only added in Android API level 19. Thus, this must
+# stay at 1.6 as long as LOCAL_SDK_VERSION is set to a value < 19. See http://b/38495704
+LOCAL_JAVA_LANGUAGE_VERSION := 1.6
 LOCAL_SDK_VERSION := 14
 LOCAL_PACKAGE_NAME := EmailTests
 LOCAL_INSTRUMENTATION_FOR := Email