OSDN Git Service
(root)
/
android-x86
/
build.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
eb41544
)
enable java 1.6
author
Chih-Wei Huang
<cwhuang@linux.org.tw>
Tue, 28 Jul 2009 09:36:34 +0000
(17:36 +0800)
committer
Chih-Wei Huang
<cwhuang@linux.org.tw>
Fri, 26 Nov 2010 07:07:28 +0000
(15:07 +0800)
core/main.mk
patch
|
blob
|
history
diff --git
a/core/main.mk
b/core/main.mk
index
11f234e
..
a4fa9e1
100644
(file)
--- a/
core/main.mk
+++ b/
core/main.mk
@@
-102,7
+102,7
@@
endif
ifneq ($(HOST_OS),windows)
# Check for the correct version of java
ifneq ($(HOST_OS),windows)
# Check for the correct version of java
-java_version := $(shell java -version 2>&1 | head -n 1 | grep '[ "]1\.
5
[\. "$$]')
+java_version := $(shell java -version 2>&1 | head -n 1 | grep '[ "]1\.
[56]
[\. "$$]')
ifeq ($(strip $(java_version)),)
$(info ************************************************************)
$(info You are attempting to build with the incorrect version)
ifeq ($(strip $(java_version)),)
$(info ************************************************************)
$(info You are attempting to build with the incorrect version)
@@
-118,7
+118,7
@@
$(error stop)
endif
# Check for the correct version of javac
endif
# Check for the correct version of javac
-javac_version := $(shell javac -version 2>&1 | head -n 1 | grep '[ "]1\.
5
[\. "$$]')
+javac_version := $(shell javac -version 2>&1 | head -n 1 | grep '[ "]1\.
[56]
[\. "$$]')
ifeq ($(strip $(javac_version)),)
$(info ************************************************************)
$(info You are attempting to build with the incorrect version)
ifeq ($(strip $(javac_version)),)
$(info ************************************************************)
$(info You are attempting to build with the incorrect version)