find_java.exe: SDK tools require Java 1.6
find_java.exe is used to locate the Path to the JVM on Windows
and it checks the Java version. SDK tools require Java 1.6 now.
Also update the find_java error message to mention the
JAVA_HOME environment variable.
SDK Bug: 39876
Change-Id: I355998b10014471ccbe14ca9e977d07126b072c1
diff --git a/find_java/find_java.bat b/find_java/find_java.bat
index 0ee00e5..6355f23 100755
--- a/find_java/find_java.bat
+++ b/find_java/find_java.bat
@@ -41,6 +41,10 @@
echo We recommend that you install the JDK version of JavaSE, available here:
echo http://www.oracle.com/technetwork/java/javase/downloads
echo.
+echo If you already have Java installed, you can define the JAVA_HOME environment
+echo variable in Control Panel / System / Avanced System Settings to point to the
+echo JDK folder.
+echo.
echo You can find the complete Android SDK requirements here:
echo http://developer.android.com/sdk/requirements.html
echo.
diff --git a/find_java/find_java.h b/find_java/find_java.h
index 0a61e73..1181aa1 100755
--- a/find_java/find_java.h
+++ b/find_java/find_java.h
@@ -21,9 +21,9 @@
#include "utils.h"
-// We currently search for a Java version for at least 1.5
+// We currently search for a Java version for at least 1.6
#define MIN_JAVA_VERSION_MAJOR 1
-#define MIN_JAVA_VERSION_MINOR 5
+#define MIN_JAVA_VERSION_MINOR 6
#define MIN_JAVA_VERSION (MIN_JAVA_VERSION_MAJOR * 1000 + MIN_JAVA_VERSION_MINOR)