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

Commit 88f5d25b authored by Ying Wang's avatar Ying Wang Committed by android-build-merger
Browse files

Merge "Don\'t check the host JDK tools when build/core/config.mk is called... 

Merge "Don\'t check the host JDK tools when build/core/config.mk is called from envsetup.sh." am: a63d379a
am: fb89fd36

* commit 'fb89fd36':
  Don't check the host JDK tools when build/core/config.mk is called from envsetup.sh.
parents 8b3e6b79 fb89fd36

core/config.mk

+3 −0
Original line number Diff line number Diff line
@@ -539,6 +539,8 @@ YACC_HEADER_SUFFIX:= .hpp 


COLUMN:= column



# We may not have the right JAVA_HOME/PATH set up yet when this is run from envsetup.sh.

ifneq ($(CALLED_FROM_SETUP),true)

HOST_JDK_TOOLS_JAR:= $(shell $(BUILD_SYSTEM)/find-jdk-tools-jar.sh)



ifneq ($(HOST_JDK_TOOLS_JAR),)
@@ -552,6 +554,7 @@ HOST_JDK_IS_64BIT_VERSION := 
ifneq ($(filter 64-Bit, $(shell java -version 2>&1)),)

HOST_JDK_IS_64BIT_VERSION := true

endif

endif  # CALLED_FROM_SETUP not true



# It's called md5 on Mac OS and md5sum on Linux

ifeq ($(HOST_OS),darwin)