commit 12621e8897d14f3b57eeb5ff09f6bd9cb638d202
author android-build-team Robot <android-build-team-robot@google.com> Wed May 24 20:04:12 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed May 24 20:04:12 2017 +0000
tree 726127ad354721e1d792709909b87c7cd5f8ea4e
parent 8a550803cd840dfb728a7e9f5a482e7dd8417fee
parent 224f3f566bda37f2ee0a7bafa75a2d815c9e9687

release-request-e81235f1-b2b4-4de1-b974-255760176f06-for-git_oc-mr1-release-4040405 snap-temp-L68200000067456736

Change-Id: I821475de23e12cd12c0b995145bf30b61ef93728

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