diff options
| author | iancottrell@chromium.org <iancottrell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-23 18:42:57 +0000 |
|---|---|---|
| committer | iancottrell@chromium.org <iancottrell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-23 18:42:57 +0000 |
| commit | 3cb00e373544aacbd269ba82f90147bf8db3c0d0 (patch) | |
| tree | cc5ca91795ba3beb863d3987e47b969f8b0b8927 /build | |
| parent | ec6c05f662eaaa298152ef55a794c0a9965ab9a7 (diff) | |
| download | chromium_src-3cb00e373544aacbd269ba82f90147bf8db3c0d0.zip chromium_src-3cb00e373544aacbd269ba82f90147bf8db3c0d0.tar.gz chromium_src-3cb00e373544aacbd269ba82f90147bf8db3c0d0.tar.bz2 | |
Remove oracle java tests from envsetup.sh
BUG=310062
Review URL: https://codereview.chromium.org/35683002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@230481 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rwxr-xr-x | build/android/envsetup.sh | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/build/android/envsetup.sh b/build/android/envsetup.sh index f8e09c4..dda9eaf 100755 --- a/build/android/envsetup.sh +++ b/build/android/envsetup.sh @@ -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 |