Revert 150343 - Add gpu targets to untrusted build, and add Graphics3D code to untrusted build.

BUG=116317
TEST=builds,manual

With this change, the IPC-based PPAPI proxy builds and runs the tumbler example.
Review URL: https://chromiumcodereview.appspot.com/10796038

TBR=bbudge@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10830197

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

4 files changed, 15 insertions, 75 deletions

diff --git a/gpu/command_buffer/client/ref_counted.h b/gpu/command_buffer/client/ref_counted.h
index e3c8f27..83346d35 100644
--- a/gpu/command_buffer/client/ref_counted.h
+++ b/gpu/command_buffer/client/ref_counted.h
@@ -5,11 +5,7 @@
 #ifndef GPU_COMMAND_BUFFER_CLIENT_REF_COUNTED_H_
 #define GPU_COMMAND_BUFFER_CLIENT_REF_COUNTED_H_
 
-// 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)
+#if defined(__native_client__)
 #include "native_client/src/include/ref_counted.h"
 namespace gpu {
 using nacl::RefCountedThreadSafe;
diff --git a/gpu/command_buffer/command_buffer.gyp b/gpu/command_buffer/command_buffer.gyp
index 7a4c10a..dffac1c 100644
--- a/gpu/command_buffer/command_buffer.gyp
+++ b/gpu/command_buffer/command_buffer.gyp
@@ -6,16 +6,13 @@
   'variables': {
     'chromium_code': 1,
   },
-  'includes': [
-    'command_buffer.gypi',
-  ],
   'targets': [
     {
       'target_name': 'gles2_utils',
       'type': '<(component)',
-      'variables': {
-        'gles2_utils_target': 1,
-      },
+      'include_dirs': [
+        '<(DEPTH)/third_party/khronos',
+      ],
       'all_dependent_settings': {
         'include_dirs': [
           '<(DEPTH)/third_party/khronos',
@@ -27,6 +24,17 @@
       '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',
+      ],
     },
   ],
 }
diff --git a/gpu/command_buffer/command_buffer.gypi b/gpu/command_buffer/command_buffer.gypi
deleted file mode 100644
index 057a7ce..0000000
--- a/gpu/command_buffer/command_buffer.gypi
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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',
-        ],
-      }],
-    ],
-  },
-}
diff --git a/gpu/command_buffer/command_buffer_untrusted.gyp b/gpu/command_buffer/command_buffer_untrusted.gyp
deleted file mode 100644
index 25987e7..0000000
--- a/gpu/command_buffer/command_buffer_untrusted.gyp
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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',
-          ],
-        },
-      ],
-    }],
-  ],
-}