commit 506113d2671e8f3dd5a46b63b7996accec6acb35
author Colin Cross <ccross@android.com> Tue Oct 27 19:12:40 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 27 19:12:40 2015 +0000
tree 39b539444c9ca7c396f7b8053155a0babe31d354
parent edfa0981c958453215fbbfccdcf6d05662cf9583
parent 112753ca552465a202557918aea372cd5880c388

Merge "Error out early on nonstandard JDK directory layouts"

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index ba2e7d5..680a169 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -533,7 +533,7 @@
 
 ifneq ($(HOST_JDK_TOOLS_JAR),)
 ifeq ($(wildcard $(HOST_JDK_TOOLS_JAR)),)
-$(error Error: could not find jdk tools.jar, please check if your JDK was installed correctly)
+$(error Error: could not find jdk tools.jar at $(HOST_JDK_TOOLS_JAR), please check if your JDK was installed correctly)
 endif
 endif
 

core/find-jdk-tools-jar.sh

diff --git a/core/find-jdk-tools-jar.sh b/core/find-jdk-tools-jar.sh
index 0224829..ac0b3b6 100755
--- a/core/find-jdk-tools-jar.sh
+++ b/core/find-jdk-tools-jar.sh
@@ -16,5 +16,5 @@
         LSLINE=$(ls -l "$JAVAC")
         JAVAC=$(echo -n "$LSLINE" | sed -e "s/.* -> //")
     done
-    echo $JAVAC | sed -e "s:\(.*\)/bin/javac.*:\\1/lib/tools.jar:"
+    echo $JAVAC | sed -e 's:\(.*\)/javac$:\1/../lib/tools.jar:'
 fi