diff options
| author | Ying Wang <wangying@android.com> | 2015-11-03 00:17:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-11-03 00:17:43 +0000 |
| commit | a63d379aab75fe3991320319f63faddd3b84b287 (patch) | |
| tree | f30af21fcf1929a196c4398e4fcd12f11d55e6ca | |
| parent | f589c7b442feb02843bdf82305b599b686fc5204 (diff) | |
| parent | 7fcd2f90867984703bbd89a7f2c56989fd7df9a2 (diff) | |
| download | build-brillo-m7-dev.tar.gz | |
Merge "Don't check the host JDK tools when build/core/config.mk is called from envsetup.sh."brillo-m7-releasebrillo-m7-dev
| -rw-r--r-- | core/config.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/config.mk b/core/config.mk index 10c66f50cd..34628acb63 100644 --- a/core/config.mk +++ b/core/config.mk @@ -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) |