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

gpu/gpu_untrusted.gyp

Index: gpu/gpu_untrusted.gyp
===================================================================
--- gpu/gpu_untrusted.gyp	(revision 150344)
+++ gpu/gpu_untrusted.gyp	(working copy)
@@ -1,116 +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',
-    'gpu_common.gypi',
-  ],
-  'conditions': [
-    ['disable_nacl==0 and disable_nacl_untrusted==0', {
-      'targets': [
-        {
-          'target_name': 'gles2_implementation_untrusted',
-          'type': 'none',
-          'variables': {
-            'nacl_untrusted_build': 1,
-            'nlib_target': 'libgles2_implementation_untrusted.a',
-            'build_glibc': 0,
-            'build_newlib': 1,
-          },
-          'defines': [
-            'GLES2_IMPL_IMPLEMENTATION',
-          ],
-          'include_dirs': [
-            '../third_party/khronos',
-          ],
-          'sources': [
-            '<@(gles2_implementation_source_files)',
-          ],
-          'dependencies': [
-            '../native_client/tools.gyp:prep_toolchain',
-            '../base/base_untrusted.gyp:base_untrusted',
-            'command_buffer/command_buffer_untrusted.gyp:gles2_utils_untrusted',
-            'gles2_cmd_helper_untrusted',
-          ],
-        },
-        {
-          'target_name': 'command_buffer_common_untrusted',
-          'type': 'none',
-          'variables': {
-            'nacl_untrusted_build': 1,
-            'nlib_target': 'libcommand_buffer_common_untrusted.a',
-            'build_glibc': 0,
-            'build_newlib': 1,
-          },
-          'includes': [
-            'command_buffer_common.gypi',
-          ],
-          'dependencies': [
-            '../native_client/tools.gyp:prep_toolchain',
-            '../base/base_untrusted.gyp:base_untrusted',
-            'command_buffer/command_buffer_untrusted.gyp:gles2_utils_untrusted',
-          ],
-        },
-        {
-          'target_name': 'gles2_cmd_helper_untrusted',
-          'type': 'none',
-          'variables': {
-            'nacl_untrusted_build': 1,
-            'nlib_target': 'libgles2_cmd_helper_untrusted.a',
-            'build_glibc': 0,
-            'build_newlib': 1,
-          },
-          'includes': [
-            'gles2_cmd_helper.gypi',
-          ],
-          'dependencies': [
-            '../native_client/tools.gyp:prep_toolchain',
-            '../base/base_untrusted.gyp:base_untrusted',
-            'command_buffer_client_untrusted',
-          ],
-        },
-        {
-          'target_name': 'command_buffer_client_untrusted',
-          'type': 'none',
-          'variables': {
-            'nacl_untrusted_build': 1,
-            'nlib_target': 'libcommand_buffer_client_untrusted.a',
-            'build_glibc': 0,
-            'build_newlib': 1,
-          },
-          'includes': [
-            'command_buffer_client.gypi',
-          ],
-          'dependencies': [
-            '../native_client/tools.gyp:prep_toolchain',
-            '../base/base_untrusted.gyp:base_untrusted',
-            'command_buffer_common_untrusted',
-          ],
-        },
-        {
-          'target_name': 'gpu_ipc_untrusted',
-          'type': 'none',
-          'variables': {
-            'nacl_untrusted_build': 1,
-            'nlib_target': 'libgpu_ipc_untrusted.a',
-            'build_glibc': 0,
-            'build_newlib': 1,
-          },
-          'includes': [
-            'gpu_ipc.gypi',
-          ],
-          'dependencies': [
-            '../native_client/tools.gyp:prep_toolchain',
-            '../base/base_untrusted.gyp:base_untrusted',
-            'command_buffer_common_untrusted',
-          ],
-        },
-      ],
-    }],
-  ],
-}