Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(770)

Unified Diff: build/android/envsetup.sh

Issue 35683002: Remove oracle java tests from envsetup.sh (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/envsetup.sh
diff --git a/build/android/envsetup.sh b/build/android/envsetup.sh
index 51f225aaaf9dd1272a0791af280a60e74ca47ff6..15b17b27cc60263f9dadc4fa3bcb7f0689813f23 100755
--- a/build/android/envsetup.sh
+++ b/build/android/envsetup.sh
@@ -109,26 +109,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
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698