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

Unified Diff: gpu/gpu.gyp

Issue 337683002: Revert of Implement software fallback for PPB_VideoDecoder. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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/cmd_buffer_common.cc ('k') | ppapi/examples/video_decode/video_decode.cc » ('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 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"', {
« no previous file with comments | « gpu/command_buffer/common/cmd_buffer_common.cc ('k') | ppapi/examples/video_decode/video_decode.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698