Commit 439aff90 authored by thestig@chromium.org's avatar thestig@chromium.org

Android: Check for Oracle Java when running build/android/envsetup.sh.

NOTRY=true

Review URL: https://chromiumcodereview.appspot.com/12218112

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182010 0039d316-1c4b-4281-b951-d872f2087c98
parent 2fb2cf7b
......@@ -104,6 +104,15 @@ elif [[ -n "$CHROME_ANDROID_BUILD_WEBVIEW" ]]; then
webview_build_init
fi
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
# 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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment