Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9373f8e authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Error out early on nonstandard JDK directory layouts" am: 506113d2 am: e95cf752 

am: 1ac51c01

* commit '1ac51c01':
  Error out early on nonstandard JDK directory layouts
parents 3d77b98d 1ac51c01

core/config.mk

+1 −1
Original line number Diff line number Diff line
@@ -539,7 +539,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

core/find-jdk-tools-jar.sh

+1 −1
Original line number Diff line number Diff line
@@ -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