diff options
| author | Tobias Thierer <tobiast@google.com> | 2017-05-24 11:39:33 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-24 11:39:33 +0000 |
| commit | dfa906a0fee4682f15f4f2e2bf72d913e57620a4 (patch) | |
| tree | 5c54b6dc9c3ce1c207c573f9f17e9a09806f6850 | |
| parent | 552ef93f45b6f818bb269920c309741c51e62b1e (diff) | |
| parent | 1239cd59a0f4dfd0a96e1a83b8871bd2b18358c6 (diff) | |
| download | Email-dfa906a0fee4682f15f4f2e2bf72d913e57620a4.tar.gz | |
Merge "EmailTests: Use language level consistent with SDK version."
am: 1239cd59a0
Change-Id: I9d75533fc7889ea0c76acc27aeb871549d5007c8
| -rw-r--r-- | tests/Android.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/Android.mk b/tests/Android.mk index 12fbdc748..5598c2ef9 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -26,6 +26,10 @@ LOCAL_MODULE_TAGS := tests 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 |