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

Unified Diff: gpu/gpu.gyp

Issue 1708783002: Mustash: move content::GPUVideoMemoryUsageStats to gpu::VideoMemoryUsageStats (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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/BUILD.gn ('k') | gpu/gpu_ipc_common.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 2ad775d2c6e601c5e106b6d2941a710e54ecec28..8d5343f9ce341135af8636a5109442e2a2e0b259 100644
--- a/gpu/gpu.gyp
+++ b/gpu/gpu.gyp
@@ -523,6 +523,7 @@
'gles2_cmd_helper',
'gpu_config',
'gpu_ipc',
+ 'gpu_ipc_common',
],
'sources': [
'gpu_export.h',
@@ -603,6 +604,14 @@
],
},
{
+ # GN version: //gpu/ipc/common
+ 'target_name': 'gpu_ipc_common',
+ 'type': 'static_library',
+ 'includes': [
+ 'gpu_ipc_common.gypi',
+ ],
+ },
+ {
'target_name': 'gpu_config',
'type': 'static_library',
'includes': [
@@ -635,6 +644,7 @@
'gles2_cmd_helper.gypi',
'gpu_config.gypi',
'gpu_ipc.gypi',
+ 'gpu_ipc_common.gypi',
'../build/android/increase_size_for_speed.gypi',
],
'defines': [
@@ -694,6 +704,14 @@
'gpu',
],
},
+ {
+ # GN version: //gpu/ipc/common
+ 'target_name': 'gpu_ipc_common',
+ 'type': 'none',
+ 'dependencies': [
+ 'gpu',
+ ],
+ },
],
}],
['disable_nacl!=1 and OS=="win" and target_arch=="ia32"', {
@@ -744,6 +762,30 @@
},
},
},
+ {
+ 'target_name': 'gpu_ipc_common_win64',
+ 'type': 'static_library',
+ 'variables': {
+ 'nacl_win64_target': 1,
+ },
+ 'includes': [
+ 'gpu_ipc_common.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/BUILD.gn ('k') | gpu/gpu_ipc_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698