commit 0c0e2b0779287601262c61f75a048aaa12a19b2a
author Treehugger Robot <treehugger-gerrit@google.com> Fri Oct 06 04:34:52 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 06 04:34:52 2017 +0000
tree 5defc35fff27ecc825a7b48f12f6b334a36d11ef
parent 750b8e84c178fadaeb4abb9a21f770bc29b27bce
parent d7b99409cef7dd158aace781ab0b4b94ba9c3e3e

Merge "Use prebuilts/jdk/jdk9 if EXPERIMENTAL_USE_OPENJDK9 is set"

core/combo/javac.mk

diff --git a/core/combo/javac.mk b/core/combo/javac.mk
index 41ebc57..122d8bc 100644
--- a/core/combo/javac.mk
+++ b/core/combo/javac.mk
@@ -16,12 +16,17 @@
   endif
 endif
 
-ifeq ($(OVERRIDE_ANDROID_JAVA_HOME),)
-ANDROID_JAVA_HOME := prebuilts/jdk/jdk8/$(HOST_PREBUILT_TAG)
-else
-# Use this build toolchain instead of the bundled one.
-ANDROID_JAVA_HOME := $(OVERRIDE_ANDROID_JAVA_HOME)
+ifneq ($(OVERRIDE_ANDROID_JAVA_HOME),)
+  # Use this build toolchain instead of the bundled one.
+  ANDROID_JAVA_HOME := $(OVERRIDE_ANDROID_JAVA_HOME)
+else # !OVERRIDE_ANDROID_JAVA_HOME
+  ifneq ($(EXPERIMENTAL_USE_OPENJDK9),)
+    ANDROID_JAVA_HOME := prebuilts/jdk/jdk9/$(HOST_PREBUILT_TAG)
+  else
+    ANDROID_JAVA_HOME := prebuilts/jdk/jdk8/$(HOST_PREBUILT_TAG)
+  endif
 endif
+
 ANDROID_JAVA_TOOLCHAIN := $(ANDROID_JAVA_HOME)/bin
 export JAVA_HOME := $(abspath $(ANDROID_JAVA_HOME))