commit 6d1cbbe318d37216b3a0c39c9a9732e9d486972a
author android-build-team Robot <android-build-team-robot@google.com> Wed May 31 07:52:03 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed May 31 07:52:03 2017 +0000
tree 726127ad354721e1d792709909b87c7cd5f8ea4e
parent 88cd9daf565c33ba1ad91977d4a7e9a25b080a07
parent e80080155633cbfacc566b62ac34a0e0b3e2bb50

release-request-31f776a2-f093-4abe-9235-1702f8bafc9d-for-git_oc-dr1-release-4054002 snap-temp-L42500000069020014

Change-Id: I4e3cfee1da8d82c37a66b9b6d8461d976a91010d

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