diff options
| author | Ying Wang <wangying@google.com> | 2010-09-22 14:11:49 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2010-09-22 14:11:49 -0700 |
| commit | 1613f4ff1ee432a01fcce70a9020f19929e7290a (patch) | |
| tree | c55bc9fa1f4e48a013113de13cbc69e118c47e02 /core/config.mk | |
| parent | fed45d859aaecd8b34fb65eeaad678e1a1c71aa9 (diff) | |
| parent | 554402f76d8720dc3784b133d95f4aba2da4aa91 (diff) | |
| download | build-1613f4ff1ee432a01fcce70a9020f19929e7290a.zip build-1613f4ff1ee432a01fcce70a9020f19929e7290a.tar.gz build-1613f4ff1ee432a01fcce70a9020f19929e7290a.tar.bz2 | |
resolved conflicts for merge of 554402f7 to master
Change-Id: Ia72f326ca91311c9eaa05aa4f5a134a60171cafb
Diffstat (limited to 'core/config.mk')
| -rw-r--r-- | core/config.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/config.mk b/core/config.mk index e8eef81..3a068d8 100644 --- a/core/config.mk +++ b/core/config.mk @@ -269,8 +269,8 @@ HOST_JDK_TOOLS_JAR := else HOST_JDK_TOOLS_JAR:= $(shell $(BUILD_SYSTEM)/find-jdk-tools-jar.sh) ifeq ($(wildcard $(HOST_JDK_TOOLS_JAR)),) -$(error Error: could not find jdk tools.jar, please install JDK-5.0, \ - update 12 or higher, which you can download from java.sun.com) +$(error Error: could not find jdk tools.jar, please install JDK-6.0, \ + which you can download from java.sun.com) endif endif |