| Index: gpu/gpu.gyp
|
| diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp
|
| index 7d0695e10896c6941b9a0ead4bc0e9c057c15e45..773182516e3b077b04a41467ae9d29f87aaf40c4 100644
|
| --- a/gpu/gpu.gyp
|
| +++ b/gpu/gpu.gyp
|
| @@ -567,16 +567,17 @@
|
| ['disable_nacl!=1 and OS=="win" and target_arch=="ia32"', {
|
| 'targets': [
|
| {
|
| - 'target_name': 'command_buffer_common_win64',
|
| + 'target_name': 'gpu_ipc_win64',
|
| 'type': 'static_library',
|
| 'variables': {
|
| 'nacl_win64_target': 1,
|
| },
|
| 'includes': [
|
| - 'command_buffer_common.gypi',
|
| + 'gpu_ipc.gypi',
|
| ],
|
| 'dependencies': [
|
| '../base/base.gyp:base_win64',
|
| + '../ipc/ipc.gyp:ipc_win64',
|
| ],
|
| 'defines': [
|
| '<@(nacl_win64_defines)',
|
| @@ -588,30 +589,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',
|
| - },
|
| - },
|
| - },
|
| ],
|
| }],
|
| ['OS == "android"', {
|
|
|