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

Commit 88e1a110 authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

am 680e0370: am 59ff6009: Merge "Unset _JAVA_OPTIONS before running "java -version"." 

* commit '680e0370':
  Unset _JAVA_OPTIONS before running "java -version".
parents 5fe1b387 680e0370

core/main.mk

+6 −6
Original line number Diff line number Diff line
@@ -151,8 +151,8 @@ requires_openjdk := true 
endif

endif



java_version_str := $(shell java -version 2>&1)

javac_version_str := $(shell javac -version 2>&1)

java_version_str := $(shell unset _JAVA_OPTIONS && java -version 2>&1)

javac_version_str := $(shell unset _JAVA_OPTIONS && javac -version 2>&1)



# Check for the current jdk

ifeq ($(requires_openjdk), true)
@@ -187,13 +187,13 @@ endif # if requires_openjdk 
ifneq ($(EXPERIMENTAL_USE_JAVA7),)

required_version := "1.7.x"

required_javac_version := "1.7"

java_version := $(shell echo '$(java_version_str)' | grep '^java .*[ "]1\.7[\. "$$]' | head -n 1)

javac_version := $(shell echo '$(javac_version_str)' | grep '[ "]1\.7[\. "$$]' | head -n 1)

java_version := $(shell echo '$(java_version_str)' | grep '^java .*[ "]1\.7[\. "$$]')

javac_version := $(shell echo '$(javac_version_str)' | grep '[ "]1\.7[\. "$$]')

else # if EXPERIMENTAL_USE_JAVA7

required_version := "1.6.x"

required_javac_version := "1.6"

java_version := $(shell echo '$(java_version_str)' | grep '^java .*[ "]1\.6[\. "$$]' | head -n 1)

javac_version := $(shell echo '$(javac_version_str)' | head -n 1 | grep '[ "]1\.6[\. "$$]' | head -n 1)

java_version := $(shell echo '$(java_version_str)' | grep '^java .*[ "]1\.6[\. "$$]')

javac_version := $(shell echo '$(javac_version_str)' | grep '[ "]1\.6[\. "$$]')

endif # if EXPERIMENTAL_USE_JAVA7



ifeq ($(required_javac_version), "1.6")