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

Unified Diff: gpu/gpu.gyp

Issue 1714903003: mustash: Move gpu/ipc to gpu/ipc/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix Win64 build Created 4 years, 10 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/command_buffer/common/mojo.typemap ('k') | gpu/gpu_ipc.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/gpu.gyp
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp
index 07b7cab2e62f0903ba748e2f45cbd2e0495caf33..b8dec1b097d82ae6810b50648e5b0f9f349268f5 100644
--- a/gpu/gpu.gyp
+++ b/gpu/gpu.gyp
@@ -523,7 +523,6 @@
'command_buffer_service',
'gles2_cmd_helper',
'gpu_config',
- 'gpu_ipc',
'gpu_ipc_common',
],
'sources': [
@@ -594,17 +593,6 @@
'msvs_disabled_warnings': [4267, ],
},
{
- # GN version: //gpu/ipc
- 'target_name': 'gpu_ipc',
- 'type': 'static_library',
- 'includes': [
- 'gpu_ipc.gypi',
- ],
- 'dependencies': [
- 'command_buffer_common',
- ],
- },
- {
# GN version: //gpu/ipc/common
'target_name': 'gpu_ipc_common',
'type': 'static_library',
@@ -644,7 +632,6 @@
'command_buffer_service.gypi',
'gles2_cmd_helper.gypi',
'gpu_config.gypi',
- 'gpu_ipc.gypi',
'gpu_ipc_common.gypi',
'../build/android/increase_size_for_speed.gypi',
],
@@ -698,14 +685,6 @@
],
},
{
- # GN version: //gpu/ipc
- 'target_name': 'gpu_ipc',
- 'type': 'none',
- 'dependencies': [
- 'gpu',
- ],
- },
- {
# GN version: //gpu/ipc/common
'target_name': 'gpu_ipc_common',
'type': 'none',
@@ -740,30 +719,6 @@
},
},
{
- 'target_name': 'gpu_ipc_win64',
- 'type': 'static_library',
- 'variables': {
- 'nacl_win64_target': 1,
- },
- 'includes': [
- 'gpu_ipc.gypi',
- ],
- 'dependencies': [
- '../base/base.gyp:base_win64',
- '../ipc/ipc.gyp:ipc_win64',
- 'command_buffer_common_win64',
- ],
- 'defines': [
- '<@(nacl_win64_defines)',
- 'GPU_IMPLEMENTATION',
- ],
- 'configurations': {
- 'Common_Base': {
- 'msvs_target_platform': 'x64',
- },
- },
- },
- {
'target_name': 'gpu_ipc_common_win64',
'type': 'static_library',
'variables': {
« no previous file with comments | « gpu/command_buffer/common/mojo.typemap ('k') | gpu/gpu_ipc.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698