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

Don't check the host JDK tools when build/core/config.mk is called from envsetup.sh. 

Envsetup.sh (lunch) relies on config.mk to get build varaible values; while
config.mk may rely on envsetup.sh to set up JAVA_HOME/PATH.
Without this change config.mk may be checking the host JDK tools before
JAVA_HOME/PATH get set up.

Change-Id: I1e6b5e33147258832ce2f0a425f9526ef4782c43
This commit is contained in:
Ying Wang 2015-11-02 15:56:58 -08:00
parent f0a8dd43b2
commit 7fcd2f9086
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

@ -539,6 +539,8 @@ YACC_HEADER_SUFFIX:= .hpp
COLUMN:= column 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) HOST_JDK_TOOLS_JAR:= $(shell $(BUILD_SYSTEM)/find-jdk-tools-jar.sh)
ifneq ($(HOST_JDK_TOOLS_JAR),) ifneq ($(HOST_JDK_TOOLS_JAR),)
@ -552,6 +554,7 @@ HOST_JDK_IS_64BIT_VERSION :=
ifneq ($(filter 64-Bit, $(shell java -version 2>&1)),) ifneq ($(filter 64-Bit, $(shell java -version 2>&1)),)
HOST_JDK_IS_64BIT_VERSION := true HOST_JDK_IS_64BIT_VERSION := true
endif endif
endif # CALLED_FROM_SETUP not true
# It's called md5 on Mac OS and md5sum on Linux # It's called md5 on Mac OS and md5sum on Linux
ifeq ($(HOST_OS),darwin) ifeq ($(HOST_OS),darwin)