android: Check whether JAVA_HOME is set incorrectly in envsetup.sh

build/android/envsetup.sh

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Sets up environment for building Chromium on Android.  It can either be
 # compiled with the Android tree or using the Android SDK/NDK. To build with
 # NDK/SDK: ". build/android/envsetup.sh".  Environment variable
 # ANDROID_SDK_BUILD=1 will then be defined and used in the rest of the setup to
 # specifiy build type.
 
@@ skipping 95 matching lines @@
 
 java -version 2>&1 | grep -qs "Java HotSpot"
 if [ $? -ne 0 ]; then
   echo "Please check and make sure you are using the Oracle Java SDK, and it"
   echo "appears before other Java SDKs in your path."
   echo "Refer to the \"Install prerequisites\" section here:"
   echo "https://code.google.com/p/chromium/wiki/AndroidBuildInstructions"
   return 1
 fi
 
+if [[ ! -z "$JAVA_HOME" && -e "$JAVA_HOME/bin/java" ]]; then

[Lei Zhang, 2013/02/14 20:00:07]

! -z   --->   -n

-e     --->   -x

[bsalomon, 2013/02/14 20:11:19]

Done.

+  "$JAVA_HOME/bin/java" -version 2>&1 | grep -qs "Java HotSpot"
+  if [ $? -ne 0 ]; then
+    echo "If JAVA_HOME is defined then it must refer to the install location"
+    echo "of the Oracle Java SDK."
+    echo "Refer to the \"Install prerequisites\" section here:"
+    echo "https://code.google.com/p/chromium/wiki/AndroidBuildInstructions"
+    return 1
+  fi
+fi
+
 # Workaround for valgrind build
 if [[ -n "$CHROME_ANDROID_VALGRIND_BUILD" ]]; then
 # arm_thumb=0 is a workaround for https://bugs.kde.org/show_bug.cgi?id=270709
   DEFINES+=" arm_thumb=0 release_extra_cflags='-fno-inline\
  -fno-omit-frame-pointer -fno-builtin' release_valgrind_build=1\
  release_optimize=1"
 fi
 
 # Source a bunch of helper functions
 . ${CHROME_SRC}/build/android/adb_device_functions.sh
@@ skipping 12 matching lines @@
   # This is just a simple wrapper of gyp_chromium, please don't add anything
   # in this function.
   echo "GYP_GENERATORS set to '$GYP_GENERATORS'"
   (
     "${CHROME_SRC}/build/gyp_chromium" --depth="${CHROME_SRC}" --check "$@"
   )
 }
 
 # FLOCK needs to be null on system that has no flock
 which flock > /dev/null || export FLOCK=