commit 1239cd59a0f4dfd0a96e1a83b8871bd2b18358c6
author Treehugger Robot <treehugger-gerrit@google.com> Wed May 24 11:30:40 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 24 11:30:42 2017 +0000
tree 5c54b6dc9c3ce1c207c573f9f17e9a09806f6850
parent 552ef93f45b6f818bb269920c309741c51e62b1e
parent 058d400da1f8323fb7cac033befce61a2478fa53

Merge "EmailTests: Use language level consistent with SDK version."

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