Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(708)

Unified Diff: gpu/gpu_nacl.gyp

Issue 2310613002: Inline GPU and opus GYP files into GN build. (Closed)
Patch Set: merge Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gpu/gpu_ipc_service.gypi ('k') | gpu/khronos_glcts_support/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/gpu_nacl.gyp
diff --git a/gpu/gpu_nacl.gyp b/gpu/gpu_nacl.gyp
deleted file mode 100644
index 4bc64f0e283ba09a79f2474fc41257c582fe3dc2..0000000000000000000000000000000000000000
--- a/gpu/gpu_nacl.gyp
+++ /dev/null
@@ -1,132 +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,
- # nacl_win64_target is for building the trusted Win64 NaCl broker.
- 'nacl_win64_target': 0,
- },
- 'includes': [
- '../build/common_untrusted.gypi',
- 'gpu_common.gypi',
- ],
- 'conditions': [
- ['disable_nacl==0 and disable_nacl_untrusted==0', {
- 'targets': [
- {
- 'target_name': 'gles2_implementation_nacl',
- 'type': 'none',
- 'variables': {
- 'nacl_untrusted_build': 1,
- 'nlib_target': 'libgles2_implementation_nacl.a',
- 'build_glibc': 0,
- 'build_newlib': 0,
- 'build_irt': 1,
- 'build_pnacl_newlib': 0,
- 'build_nonsfi_helper': 1,
- },
- 'defines': [
- 'GLES2_IMPL_IMPLEMENTATION',
- ],
- 'sources': [
- '<@(gles2_implementation_source_files)',
- ],
- 'dependencies': [
- '../base/base_nacl.gyp:base_nacl',
- '../base/base_nacl.gyp:base_nacl_nonsfi',
- '../third_party/khronos/khronos.gyp:khronos_headers',
- 'command_buffer/command_buffer_nacl.gyp:gles2_utils_nacl',
- 'gles2_cmd_helper_nacl',
- ],
- },
- {
- 'target_name': 'command_buffer_common_nacl',
- 'type': 'none',
- 'variables': {
- 'nacl_untrusted_build': 1,
- 'nlib_target': 'libcommand_buffer_common_nacl.a',
- 'build_glibc': 0,
- 'build_newlib': 0,
- 'build_irt': 1,
- 'build_pnacl_newlib': 0,
- 'build_nonsfi_helper': 1,
- },
- 'includes': [
- 'command_buffer_common.gypi',
- ],
- 'dependencies': [
- '../base/base_nacl.gyp:base_nacl',
- '../base/base_nacl.gyp:base_nacl_nonsfi',
- 'command_buffer/command_buffer_nacl.gyp:gles2_utils_nacl',
- ],
- },
- {
- 'target_name': 'gles2_cmd_helper_nacl',
- 'type': 'none',
- 'variables': {
- 'nacl_untrusted_build': 1,
- 'nlib_target': 'libgles2_cmd_helper_nacl.a',
- 'build_glibc': 0,
- 'build_newlib': 0,
- 'build_irt': 1,
- 'build_pnacl_newlib': 0,
- 'build_nonsfi_helper': 1,
- },
- 'includes': [
- 'gles2_cmd_helper.gypi',
- ],
- 'dependencies': [
- '../base/base_nacl.gyp:base_nacl',
- '../base/base_nacl.gyp:base_nacl_nonsfi',
- 'command_buffer_client_nacl',
- ],
- },
- {
- 'target_name': 'command_buffer_client_nacl',
- 'type': 'none',
- 'variables': {
- 'nacl_untrusted_build': 1,
- 'nlib_target': 'libcommand_buffer_client_nacl.a',
- 'build_glibc': 0,
- 'build_newlib': 0,
- 'build_irt': 1,
- 'build_pnacl_newlib': 0,
- 'build_nonsfi_helper': 1,
- },
- 'includes': [
- 'command_buffer_client.gypi',
- ],
- 'dependencies': [
- '../base/base_nacl.gyp:base_nacl',
- '../base/base_nacl.gyp:base_nacl_nonsfi',
- 'command_buffer_common_nacl',
- ],
- },
- {
- 'target_name': 'gpu_ipc_nacl',
- 'type': 'none',
- 'variables': {
- 'nacl_untrusted_build': 1,
- 'nlib_target': 'libgpu_ipc_nacl.a',
- 'build_glibc': 0,
- 'build_newlib': 0,
- 'build_irt': 1,
- 'build_pnacl_newlib': 0,
- 'build_nonsfi_helper': 1,
- },
- 'includes': [
- 'command_buffer_traits.gypi',
- ],
- 'dependencies': [
- '../base/base_nacl.gyp:base_nacl',
- '../base/base_nacl.gyp:base_nacl_nonsfi',
- '../ui/gfx/ipc/geometry/gfx_ipc_geometry_nacl.gyp:gfx_ipc_geometry_nacl',
- 'command_buffer_common_nacl',
- ],
- },
- ],
- }],
- ],
-}
« no previous file with comments | « gpu/gpu_ipc_service.gypi ('k') | gpu/khronos_glcts_support/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698