From 62525634a6f5727216828f8e05a4f563be90dfeb Mon Sep 17 00:00:00 2001
From: "bradnelson@google.com"
 <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Tue, 29 Sep 2009 00:21:56 +0000
Subject: Fixing some things that are failing in the linux o3d gyp build.

BUG=None
TEST=None

Review URL: http://codereview.chromium.org/209025

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27442 0039d316-1c4b-4281-b951-d872f2087c98
---
 o3d/DEPS_gyp           | 7 +++++++
 o3d/plugin/idl/idl.gyp | 4 +++-
 2 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'o3d')

diff --git a/o3d/DEPS_gyp b/o3d/DEPS_gyp
index f16fee6..74d68a6 100644
--- a/o3d/DEPS_gyp
+++ b/o3d/DEPS_gyp
@@ -138,6 +138,13 @@ deps_os = {
     # Linux, really.
     "site_scons":
       Var("chromium_trunk") + "/src/site_scons@" + Var("chromium_rev"),
+    # TODO(bradnelson): make these optional!!!
+    # These are currently required by gyp on linux (even though o3d isn't using
+    # data_pack or grit).
+    "tools/grit":
+      Var("chromium_trunk") + "/src/tools/grit@" + Var("chromium_rev"),
+    "tools/data_pack":
+      Var("chromium_trunk") + "/src/tools/data_pack@" + Var("chromium_rev"),
   },
 }
 
diff --git a/o3d/plugin/idl/idl.gyp b/o3d/plugin/idl/idl.gyp
index 8d34808..b996627 100644
--- a/o3d/plugin/idl/idl.gyp
+++ b/o3d/plugin/idl/idl.gyp
@@ -141,7 +141,9 @@
             '<@(idl_files)',
           ],
           'outputs': [
-            '<(idl_out_path)/hash',
+            # TODO(bradnelson): fix gyp to be able to handle outputs without
+            # and extension on linux.
+            #'<(idl_out_path)/hash',
             '<(idl_out_path)/globals_glue.cc',
             '<(idl_out_path)/globals_glue.h',
             '<!@(python idl_filenames.py \'<(idl_out_path)\' <@(idl_files))',
-- 
cgit v1.1