diff options
| author | kbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-05 23:09:08 +0000 |
|---|---|---|
| committer | kbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-05 23:09:08 +0000 |
| commit | ab6c890e9f217c8e91d9119755a61c25ec7e41b8 (patch) | |
| tree | 548a8bad6a4ce0c9ee8e9ae07717090f07a1e1c4 /o3d | |
| parent | c2d602b32d86c44e6eb1fe6b1d12fda314e21a62 (diff) | |
| download | chromium_src-ab6c890e9f217c8e91d9119755a61c25ec7e41b8.zip chromium_src-ab6c890e9f217c8e91d9119755a61c25ec7e41b8.tar.gz chromium_src-ab6c890e9f217c8e91d9119755a61c25ec7e41b8.tar.bz2 | |
Force Java version to 1.6.0 on Mac OS X because apparently latest
JSCompiler binaries require this version. Verified this fix on 10.5
and tested on 10.6 as well.
Review URL: http://codereview.chromium.org/578022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38275 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d')
| -rw-r--r-- | o3d/documentation/documentation.gyp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/o3d/documentation/documentation.gyp b/o3d/documentation/documentation.gyp index 1d697e0..0c51cdf 100644 --- a/o3d/documentation/documentation.gyp +++ b/o3d/documentation/documentation.gyp @@ -10,6 +10,15 @@ # available. 'jscomp_exists': '<!(python ../build/file_exists.py ' '../../o3d-internal/jscomp/JSCompiler_deploy.jar)', + 'conditions': [ + [ 'OS=="mac"', { + # We need to point to Java 6 explicitly on Mac OS X + 'java_exe%': '/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Commands/java' + }, { + # OS!="mac" + 'java_exe%': 'java' + }], + ], }, 'includes': [ '../build/common.gypi', @@ -69,7 +78,7 @@ 'action': [ 'python', 'build_docs.py', - 'java', + '<@(java_exe)', '../../third_party', '<(PRODUCT_DIR)/docs', ], |