p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Fix for Java 8 toolchain builds"

This commit is contained in:
Neil Fuller 2015-10-13 08:26:16 +00:00 committed by Gerrit Code Review
parent b7462534f2 e8304ef768
commit 9d14d317c8
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/main.mk
View File

@ -179,7 +179,7 @@ javac_version_str := $(shell unset _JAVA_OPTIONS && javac -version 2>&1)
ifneq ($(EXPERIMENTAL_USE_JAVA8),)
required_version := "1.8.x"
required_javac_version := "1.8"
java_version := $(shell echo '$(java_version_str)' | grep 'openjdk .*[ "]1\.8[\. "$$]')
java_version := $(shell echo '$(java_version_str)' | grep '[ "]1\.8[\. "$$]')
javac_version := $(shell echo '$(javac_version_str)' | grep '[ "]1\.8[\. "$$]')
else # default
required_version := "1.7.x"