Add gpu targets to untrusted build, and add Graphics3D code to untrus…

…ted build.

BUG=116317
TEST=builds,manual

With this change, the IPC-based PPAPI proxy builds all code needed for 3d and OpenGL ES.
Review URL: https://chromiumcodereview.appspot.com/10837145

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150432 0039d316-1c4b-4281-b951-d872f2087c98

gpu/command_buffer/client/ref_counted.h

@@ -5,7 +5,11 @@
 #ifndef GPU_COMMAND_BUFFER_CLIENT_REF_COUNTED_H_
 #define GPU_COMMAND_BUFFER_CLIENT_REF_COUNTED_H_
 
-#if defined(__native_client__)
+// TODO(bbudge) The NaCl SRPC proxy can't depend on base, so we define our own
+// ref_counted. This causes duplicate class warnings in the NaCl IPC proxy,
+// which uses base. Remove the custom ref_counted class after NaCl has switched
+// proxies.
+#if defined(__native_client__) && !defined(NACL_PPAPI_IPC_PROXY)
 #include "native_client/src/include/ref_counted.h"
 namespace gpu {
 using nacl::RefCountedThreadSafe;

gpu/command_buffer/command_buffer.gyp

@@ -6,13 +6,16 @@
   'variables': {
     'chromium_code': 1,
   },
+  'includes': [
+    'command_buffer.gypi',
+  ],
   'targets': [
     {
       'target_name': 'gles2_utils',
       'type': '<(component)',
-      'include_dirs': [
-        '<(DEPTH)/third_party/khronos',
-      ],
+      'variables': {
+        'gles2_utils_target': 1,
+      },
       'all_dependent_settings': {
         'include_dirs': [
           '<(DEPTH)/third_party/khronos',
@@ -24,17 +27,6 @@
       'export_dependent_settings': [
         '../../base/base.gyp:base',
       ],
-      'defines': [
-        'GLES2_UTILS_IMPLEMENTATION',
-      ],
-      'sources': [
-        'common/gles2_cmd_format.h',
-        'common/gles2_cmd_utils.cc',
-        'common/gles2_cmd_utils.h',
-        'common/gles2_utils_export.h',
-        'common/logging.cc',
-        'common/logging.h',
-      ],
     },
   ],
 }

gpu/command_buffer/command_buffer.gypi

@@ -0,0 +1,30 @@
+# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+  'target_defaults': {
+    'variables': {
+      'gles2_utils_target': 0,
+    },
+    'target_conditions': [
+      # This part is shared between the targets defined below.
+      ['gles2_utils_target==1', {
+        'defines': [
+          'GLES2_UTILS_IMPLEMENTATION',
+        ],
+        'include_dirs': [
+          '<(DEPTH)/third_party/khronos',
+        ],
+        'sources': [
+          'common/gles2_cmd_format.h',
+          'common/gles2_cmd_utils.cc',
+          'common/gles2_cmd_utils.h',
+          'common/gles2_utils_export.h',
+          'common/logging.cc',
+          'common/logging.h',
+        ],
+      }],
+    ],
+  },
+}

gpu/command_buffer/command_buffer_untrusted.gyp

@@ -0,0 +1,34 @@
+# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+  'variables': {
+    'chromium_code': 1,
+  },
+  'includes': [
+    '../../native_client/build/untrusted.gypi',
+    'command_buffer.gypi',
+  ],
+  'conditions': [
+    ['disable_nacl==0 and disable_nacl_untrusted==0', {
+      'targets': [
+        {
+          'target_name': 'gles2_utils_untrusted',
+          'type': 'none',
+          'variables': {
+            'gles2_utils_target': 1,
+            'nacl_untrusted_build': 1,
+            'nlib_target': 'libgles2_utils_untrusted.a',
+            'build_glibc': 0,
+            'build_newlib': 1,
+          },
+          'dependencies': [
+            '../../native_client/tools.gyp:prep_toolchain',
+            '../../base/base_untrusted.gyp:base_untrusted',
+          ],
+        },
+      ],
+    }],
+  ],
+}

gpu/command_buffer_common.gypi

@@ -11,10 +11,6 @@
       '<(DEPTH)/third_party/khronos',
     ],
   },
-  'dependencies': [
-    '../base/base.gyp:base',
-    'command_buffer/command_buffer.gyp:gles2_utils',
-  ],
   'sources': [
     'command_buffer/common/bitfield_helpers.h',
     'command_buffer/common/buffer.h',