tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am 9789c5f7: am f0eab404: am 9d14d317: Merge "Fix for Java 8 toolchain builds"

Browse source 
* commit '9789c5f7dffad0a9d14b671b9ed26e0dfb1c0242':
  Fix for Java 8 toolchain builds
This commit is contained in:
Neil Fuller 2015-10-13 09:24:59 +00:00 committed by Android Git Automerger
commit 08c9f7db41
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"