Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set JAVA_HOME env var to OpenJDK 8 for Android builds #638

Merged
merged 1 commit into from Apr 18, 2017
Merged
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

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.
  • Loading branch information
aneeshusa committed Apr 18, 2017
commit ca86297584bd23d79c8ffd9bfa5f1e39186a4a65
@@ -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',
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.