From ca86297584bd23d79c8ffd9bfa5f1e39186a4a65 Mon Sep 17 00:00:00 2001 From: Aneesh Agrawal Date: Mon, 17 Apr 2017 18:22:59 -0400 Subject: [PATCH] Set JAVA_HOME env var to OpenJDK 8 for Android builds The new gradle builds require Java 8, and the existing ant builds also work with Java 8. This is easier than running many `update-alternatives` calls from Salt. Moreover, this allows keeping Java 7 installed together with Java 8. --- buildbot/master/files/config/environments.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/buildbot/master/files/config/environments.py b/buildbot/master/files/config/environments.py index b0e7bdeb..6f16a1a7 100644 --- a/buildbot/master/files/config/environments.py +++ b/buildbot/master/files/config/environments.py @@ -79,6 +79,8 @@ def without(self, to_unset): build_android = build_linux + Environment({ 'ANDROID_NDK': '{{ common.servo_home }}/android/ndk/current/', 'ANDROID_SDK': '{{ common.servo_home }}/android/sdk/current/', + # TODO(aneeshusa): Template this value for e.g. macOS builds + 'JAVA_HOME': '/usr/lib/jvm/java-8-openjdk-amd64', 'PATH': ':'.join([ '/usr/local/sbin', '/usr/local/bin',