diff options
| author | Colin Cross <ccross@android.com> | 2015-10-27 19:12:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-10-27 19:12:40 +0000 |
| commit | 506113d2671e8f3dd5a46b63b7996accec6acb35 (patch) | |
| tree | 39b539444c9ca7c396f7b8053155a0babe31d354 | |
| parent | edfa0981c958453215fbbfccdcf6d05662cf9583 (diff) | |
| parent | 112753ca552465a202557918aea372cd5880c388 (diff) | |
| download | build-506113d2671e8f3dd5a46b63b7996accec6acb35.tar.gz | |
Merge "Error out early on nonstandard JDK directory layouts"
| -rw-r--r-- | core/config.mk | 2 | ||||
| -rwxr-xr-x | core/find-jdk-tools-jar.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/config.mk b/core/config.mk index ba2e7d5c03..680a16906f 100644 --- a/core/config.mk +++ b/core/config.mk @@ -533,7 +533,7 @@ HOST_JDK_TOOLS_JAR:= $(shell $(BUILD_SYSTEM)/find-jdk-tools-jar.sh) 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 diff --git a/core/find-jdk-tools-jar.sh b/core/find-jdk-tools-jar.sh index 02248295f9..ac0b3b6b59 100755 --- a/core/find-jdk-tools-jar.sh +++ b/core/find-jdk-tools-jar.sh @@ -16,5 +16,5 @@ else 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 |