Change default JVM location to /usr/lib/jvm/java-7-openjdk-amd64
Given that OpenJDK 1.7 is the recommended Java SDK for
Chromium these days, we should get rid of linking to the old
non-standardized link referring to a Sun Java 1.6 SDK.
Instead of requiring all users to set JAVA_HOME, I prefer
have the most common path as default and and close webrtc:2113
as won't fix after this is submitted.
BUG=2113
R=henrike@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/29839004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7584 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/talk/build/common.gypi b/talk/build/common.gypi
index 7ee4224..d682381 100644
--- a/talk/build/common.gypi
+++ b/talk/build/common.gypi
@@ -39,9 +39,7 @@
'libpeer_target_type%': 'static_library',
'conditions': [
['OS=="android" or OS=="linux"', {
- # TODO(henrike): make sure waterfall bots have $JAVA_HOME configured
- # properly and remove the default value below. See issue 2113.
- 'java_home%': '<!(python -c "import os; dir=os.getenv(\'JAVA_HOME\', \'/usr/lib/jvm/java-6-sun\'); assert os.path.exists(os.path.join(dir, \'include/jni.h\')), \'Point \\$JAVA_HOME or the java_home gyp variable to a directory containing include/jni.h!\'; print dir")',
+ 'java_home%': '<!(python -c "import os; dir=os.getenv(\'JAVA_HOME\', \'/usr/lib/jvm/java-7-openjdk-amd64\'); assert os.path.exists(os.path.join(dir, \'include/jni.h\')), \'Point \\$JAVA_HOME or the java_home gyp variable to a directory containing include/jni.h!\'; print dir")',
}],
],
},
