diff options
| author | Narayan Kamath <narayan@google.com> | 2014-04-02 10:57:13 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-02 10:57:13 +0000 |
| commit | 823f0ba6b8b52566d453d4770ac4e09f89b90842 (patch) | |
| tree | 2b7a7b99842db9ab4ad297e8157d3185424d2ba5 /core/main.mk | |
| parent | 7e28c0742794e0866cfdd19a586f9e5c9b6cfbb4 (diff) | |
| parent | 0239220a67f168fa30703e07750d1f4907dc99bf (diff) | |
| download | build-823f0ba6b8b52566d453d4770ac4e09f89b90842.zip build-823f0ba6b8b52566d453d4770ac4e09f89b90842.tar.gz build-823f0ba6b8b52566d453d4770ac4e09f89b90842.tar.bz2 | |
am 0239220a: am 2f5de9f5: Merge "Bring main.mk in sync with master."
* commit '0239220a67f168fa30703e07750d1f4907dc99bf':
Bring main.mk in sync with master.
Diffstat (limited to 'core/main.mk')
| -rw-r--r-- | core/main.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/main.mk b/core/main.mk index 3bbfbd5..45ca393 100644 --- a/core/main.mk +++ b/core/main.mk @@ -152,6 +152,8 @@ endif endif ifeq ($(requires_openjdk), true) +# The user asked for java7 openjdk, so check that the host +# java version is really openjdk ifeq ($(shell java -version 2>&1 | grep -i openjdk),) $(info ************************************************************) $(info You are attempting to build with an unsupported JDK.) @@ -180,10 +182,12 @@ endif # if requires_openjdk # EXPERIMENTAL_USE_JAVA7 is set, 1.6 otherwise. ifneq ($(EXPERIMENTAL_USE_JAVA7),) required_version := "1.7.x" +required_javac_version := "1.7" java_version := $(shell java -version 2>&1 | grep '^java .*[ "]1\.7[\. "$$]' | head -n 1) javac_version := $(shell javac -version 2>&1 | grep '[ "]1\.7[\. "$$]' | head -n 1 ) else # if EXPERIMENTAL_USE_JAVA7 required_version := "1.6.x" +required_javac_version := "1.6" java_version := $(shell java -version 2>&1 | grep '^java .*[ "]1\.6[\. "$$]' | head -n 1) javac_version := $(shell javac -version 2>&1 | grep '[ "]1\.6[\. "$$]' | head -n 1) endif # if EXPERIMENTAL_USE_JAVA7 @@ -209,7 +213,7 @@ $(info You are attempting to build with the incorrect version) $(info of javac.) $(info $(space)) $(info Your version is: $(shell javac -version 2>&1 | grep '^javac' | head -n 1).) -$(info The required version is: $(required_java_version)) +$(info The required version is: $(required_javac_version)) $(info $(space)) $(info Please follow the machine setup instructions at) $(info $(space)$(space)$(space)$(space)https://source.android.com/source/download.html) |