openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

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

am: 88f5d25be1

* commit '88f5d25be1b0756db65b34114929b4dd0bc5f05c':
  Don't check the host JDK tools when build/core/config.mk is called from envsetup.sh.
This commit is contained in:
Ying Wang 2015-11-03 00:49:23 +00:00 committed by android-build-merger
parent 700911d027 88f5d25be1
commit f0b5cd2de6
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/config.mk
View File

@ -545,6 +545,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),)
@ -558,6 +560,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)