Branched gpu process and command buffer code into Chrome tree. Fixed up paths...

gpu/gpu.gyp

Index: gpu/gpu.gyp
===================================================================
--- gpu/gpu.gyp	(revision 32865)
+++ gpu/gpu.gyp	(working copy)
@@ -11,20 +11,75 @@
   ],
   'targets': [
     {
+      'target_name': 'gl_libs',
+      'type': 'static_library',
+        'include_dirs': [
+          '../third_party/glew/include',
+        ],
+        'defines': [
+          'GLEW_STATIC',
+        ],
+      'all_dependent_settings': {
+        'include_dirs': [
+          '../third_party/glew/include',
+        ],
+        'defines': [
+          'GLEW_STATIC',
+        ],
+      },
+      'sources': [
+        '../third_party/glew/src/glew.c',
+      ],
+      'conditions': [
+        [ 'OS=="linux"',
+          {
+            'all_dependent_settings': {
+              'defines': [
+                'GL_GLEXT_PROTOTYPES',
+              ],
+              'ldflags': [
+                '-L<(PRODUCT_DIR)',
+              ],
+              'libraries': [
+                '-lGL',
+                '-lX11',
+              ],
+            },
+          },
+        ],
+        [ 'OS=="mac"',
+          {
+            'direct_dependent_settings': {
+              'libraries': [
+                '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework',
+              ],
+            },
+          },
+        ],
+        [ 'OS=="win"',
+          {
+            'all_dependent_settings': {
+              'libraries': [
+                '-lOpenGL32.lib',
+              ],
+            },
+          },
+        ],
+      ],
+    },
+    {
       'target_name': 'command_buffer_common',
       'type': 'static_library',
       'include_dirs': [
         'command_buffer/common',
         '..',
-        '../..',
       ],
       'all_dependent_settings': {
         'include_dirs': [
           'command_buffer/common',
           '..',
-          '../..',
         ],
-      },  # 'all_dependent_settings'
+      },
       'sources': [
         'command_buffer/common/bitfield_helpers.h',
         'command_buffer/common/cmd_buffer_common.h',
@@ -125,7 +180,6 @@
       'type': 'static_library',
       'dependencies': [
         'command_buffer_common',
-        'np_utils',
       ],
       'sources': [
         'command_buffer/client/cmd_buffer_helper.cc',
@@ -152,17 +206,15 @@
       'type': 'static_library',
       'include_dirs': [
         '..',
-        '../..',
       ],
       'all_dependent_settings': {
         'include_dirs': [
           '..',
-          '../..',
         ],
-      },  # 'all_dependent_settings'
+      },
       'dependencies': [
         'command_buffer_common',
-        '../build/libs.gyp:gl_libs',
+        'gl_libs',
       ],
       'sources': [
         'command_buffer/service/common_decoder.cc',
@@ -220,21 +272,16 @@
       'target_name': 'np_utils',
       'type': '<(library)',
       'dependencies': [
-        '../../base/base.gyp:base',
-        '../build/o3d_in_chrome.gyp:o3d_in_chrome',
+        '../base/base.gyp:base',
       ],
       'include_dirs': [
         '..',
-        '../..',
-        '../../third_party/npapi',
       ],
       'all_dependent_settings': {
         'include_dirs': [
           '..',
-          '../..',
-          '../../third_party/npapi',
         ],
-      },  # 'all_dependent_settings'
+      },
       'sources': [
         'np_utils/default_np_object.h',
         'np_utils/dynamic_np_object.cc',
@@ -267,7 +314,6 @@
       'direct_dependent_settings': {
         'include_dirs': [
           '..',
-          '../..',
         ],
         'sources': [
           'np_utils/dispatched_np_object_unittest.cc',
@@ -282,20 +328,18 @@
       'target_name': 'gpu_plugin',
       'type': '<(library)',
       'dependencies': [
-        '../../base/base.gyp:base',
+        '../base/base.gyp:base',
         'command_buffer_service',
         'np_utils',
       ],
       'include_dirs': [
         '..',
-        '../..',
       ],
       'all_dependent_settings': {
         'include_dirs': [
           '..',
-          '../..',
         ],
-      },  # 'all_dependent_settings'
+      },
       'sources': [
         'gpu_plugin/gpu_plugin.cc',
         'gpu_plugin/gpu_plugin.h',
@@ -312,7 +356,6 @@
       'direct_dependent_settings': {
         'include_dirs': [
           '..',
-          '../..',
         ],
         'sources': [
           'gpu_plugin/gpu_plugin_unittest.cc',
@@ -325,9 +368,9 @@
       'target_name': 'gpu_all_unittests',
       'type': 'executable',
       'dependencies': [
-        '../../testing/gmock.gyp:gmock',
-        '../../testing/gmock.gyp:gmockmain',
-        '../../testing/gtest.gyp:gtest',
+        '../testing/gmock.gyp:gmock',
+        '../testing/gmock.gyp:gmockmain',
+        '../testing/gtest.gyp:gtest',
         'command_buffer_client',
         'command_buffer_client_unittests',
         'command_buffer_common',