diff options
| author | markdittmer <markdittmer@chromium.org> | 2016-03-02 08:08:29 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-02 16:10:02 +0000 |
| commit | cbf36ceafceb140cdc5d6f45a9ae2053483795c4 (patch) | |
| tree | 90b48204a027deed138b35b855859d8afe4a09df /gpu/gpu.gyp | |
| parent | 88336cbc14c314ee0b5d6c445ad2dca23ad5892a (diff) | |
| download | chromium_src-cbf36ceafceb140cdc5d6f45a9ae2053483795c4.zip chromium_src-cbf36ceafceb140cdc5d6f45a9ae2053483795c4.tar.gz chromium_src-cbf36ceafceb140cdc5d6f45a9ae2053483795c4.tar.bz2 | |
Move content:GPUVideo...Stats to gpu::Video...Stats. HolyJavaStyleNamingBatman!
As a part of the GPU refactor for Mus, we are trying to eliminate spots where content/common/gpu depends on
content/. One such dependency is content::GPUVideoMemoryUsageStats.
BUG=586367
CQ_INCLUDE_TRYBOTS=tryserver.chromium.win:win_optional_gpu_tests_rel
Committed: https://crrev.com/6c1a70a5d0436c7c647c995202fbfa307f28983a
Cr-Commit-Position: refs/heads/master@{#377036}
Review URL: https://codereview.chromium.org/1708783002
Cr-Commit-Position: refs/heads/master@{#378757}
Diffstat (limited to 'gpu/gpu.gyp')
| -rw-r--r-- | gpu/gpu.gyp | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp index 4eebf73..643de3d 100644 --- a/gpu/gpu.gyp +++ b/gpu/gpu.gyp @@ -597,6 +597,7 @@ 'gles2_cmd_helper', 'gpu_config', 'gpu_ipc', + 'gpu_ipc_common', ], 'sources': [ 'gpu_export.h', @@ -677,6 +678,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': [ @@ -709,6 +718,7 @@ 'gles2_cmd_helper.gypi', 'gpu_config.gypi', 'gpu_ipc.gypi', + 'gpu_ipc_common.gypi', '../build/android/increase_size_for_speed.gypi', ], 'defines': [ @@ -768,6 +778,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"', { @@ -818,6 +836,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"', { |