OSDN Git Service
(root)
/
android-x86
/
build.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3efd768
67e0c2a
)
resolved conflicts for merge of 67e0c2a6 to master
author
Ying Wang
<wangying@google.com>
Thu, 23 Sep 2010 00:45:35 +0000
(17:45 -0700)
committer
Ying Wang
<wangying@google.com>
Thu, 23 Sep 2010 00:45:35 +0000
(17:45 -0700)
Change-Id: I7940c7ae3dd1900180e4767f1c86957db4cf3a1f
1
2
core/config.mk
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/config.mk
index
51283ee
,
ba09895
..
b283b8c
---
1
/
core/config.mk
---
2
/
core/config.mk
+++ b/
core/config.mk
@@@
-270,10
-267,6
+270,10
@@@
ifeq ($(HOST_OS),darwin
HOST_JDK_TOOLS_JAR :=
else
HOST_JDK_TOOLS_JAR:= $(shell $(BUILD_SYSTEM)/find-jdk-tools-jar.sh)
- $(error Error: could not find jdk tools.jar, please install JDK-6.0, \
+ifeq ($(wildcard $(HOST_JDK_TOOLS_JAR)),)
++$(error Error: could not find jdk tools.jar, please install JDK6, \
+ which you can download from java.sun.com)
+endif
endif
# It's called md5 on Mac OS and md5sum on Linux