From ab6c890e9f217c8e91d9119755a61c25ec7e41b8 Mon Sep 17 00:00:00 2001
From: "kbr@chromium.org"
 <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 5 Feb 2010 23:09:08 +0000
Subject: 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
---
 o3d/documentation/documentation.gyp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

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',
                 ],
-- 
cgit v1.1