diff options
author | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-07 15:03:16 +0000 |
---|---|---|
committer | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-07 15:03:16 +0000 |
commit | b69afa2be89d69abee78bda14e6d95f933b42aae (patch) | |
tree | eb10a95c93a0efb68545fefb14fb71defcc9fe9d /gpu/gpu_untrusted.gyp | |
parent | 1555f8cd3784f3d980098822079e43e18bdb8ba2 (diff) | |
download | chromium_src-b69afa2be89d69abee78bda14e6d95f933b42aae.zip chromium_src-b69afa2be89d69abee78bda14e6d95f933b42aae.tar.gz chromium_src-b69afa2be89d69abee78bda14e6d95f933b42aae.tar.bz2 |
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
Diffstat (limited to 'gpu/gpu_untrusted.gyp')
-rw-r--r-- | gpu/gpu_untrusted.gyp | 116 |
1 files changed, 0 insertions, 116 deletions
diff --git a/gpu/gpu_untrusted.gyp b/gpu/gpu_untrusted.gyp deleted file mode 100644 index 33abfcd..0000000 --- a/gpu/gpu_untrusted.gyp +++ /dev/null @@ -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', - ], - }, - ], - }], - ], -} |