Remove oracle java tests from envsetup.sh
BUG=310062 Review URL: https://codereview.chromium.org/35683002 git-svn-id: http://src.chromium.org/svn/trunk/src/build@230481 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
Родитель
d5e7d11dc0
Коммит
dbbf919912
|
@ -108,26 +108,6 @@ 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
|
||||
|
||||
if [[ -n "$JAVA_HOME" && -x "$JAVA_HOME/bin/java" ]]; then
|
||||
"$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
|
||||
|
|
Загрузка…
Ссылка в новой задаче