commit 3b37b138b150dfde98960c1350767a1c718771ac
author Colin Cross <ccross@android.com> Tue Jul 25 08:30:01 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jul 25 08:30:01 2017 +0000
tree ded68857541821d97ba2064cdd552220792ff3d8
parent 7190f9b8d636850198f947de02a2229524b51b82
parent 41ca5a2e2dc8928c723819b4ab8e2c7af6b37655

Merge "Make JAVA_HOME absolute inside build" am: 194893ee6c am: bac4bd6973 am: 80bd8e47f5 am: 5d68c8927c
am: 41ca5a2e2d

Change-Id: I1884d33d3b2202e8da110fa7416130e773f62cfb

core/combo/javac.mk

diff --git a/core/combo/javac.mk b/core/combo/javac.mk
index 6d05e06..36ac2aa 100644
--- a/core/combo/javac.mk
+++ b/core/combo/javac.mk
@@ -18,7 +18,7 @@
 
 ANDROID_JAVA_HOME := prebuilts/jdk/jdk8/$(HOST_PREBUILT_TAG)
 ANDROID_JAVA_TOOLCHAIN := $(ANDROID_JAVA_HOME)/bin
-export JAVA_HOME := $(ANDROID_JAVA_HOME)
+export JAVA_HOME := $(abspath $(ANDROID_JAVA_HOME))
 
 # Use the indexer wrapper to index the codebase instead of the javac compiler
 ifeq ($(ALTERNATE_JAVAC),)