diff options
author | thakis <thakis@chromium.org> | 2016-02-24 07:12:00 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-02-24 15:13:23 +0000 |
commit | cf7a9b7d244d6f9ed03e139adebcd58e492f6aea (patch) | |
tree | 9d93313867722a1e0244785a19db9674cf057f4f /gpu/BUILD.gn | |
parent | c4d8f0be80b5b6fedb094a9254adf3c6d0f6ecab (diff) | |
download | chromium_src-cf7a9b7d244d6f9ed03e139adebcd58e492f6aea.zip chromium_src-cf7a9b7d244d6f9ed03e139adebcd58e492f6aea.tar.gz chromium_src-cf7a9b7d244d6f9ed03e139adebcd58e492f6aea.tar.bz2 |
Revert of Mustash: move content::GPUVideoMemoryUsageStats to gpu::VideoMemoryUsageStats (patchset #5 id:80001 of https://codereview.chromium.org/1708783002/ )
Reason for revert:
Doesn't build on win/gn bots: https://build.chromium.org/p/chromium.win/builders/Win%20x64%20GN%20%28dbg%29/builds/18944/steps/compile/logs/stdio
FAILED: E:/b/depot_tools/python276_bin/python.exe gyp-win-tool link-wrapper environment.x64 False link.exe /nologo /IMPLIB:./content.dll.lib /DLL /OUT:./content.dll /PDB:./content.dll.pdb @./content.dll.rsp
gpu.dll.lib(gpu.dll) : error LNK2005: "public: __cdecl gpu::VideoMemoryUsageStats::VideoMemoryUsageStats(void)" (??0VideoMemoryUsageStats@gpu@@QEAA@XZ) already defined in memory_stats.obj
gpu.dll.lib(gpu.dll) : error LNK2005: "public: __cdecl gpu::VideoMemoryUsageStats::~VideoMemoryUsageStats(void)" (??1VideoMemoryUsageStats@gpu@@QEAA@XZ) already defined in memory_stats.obj
gpu.dll.lib(gpu.dll) : error LNK2005: "public: __cdecl gpu::VideoMemoryUsageStats::ProcessStats::ProcessStats(void)" (??0ProcessStats@VideoMemoryUsageStats@gpu@@QEAA@XZ) already defined in memory_stats.obj
gpu.dll.lib(gpu.dll) : error LNK2005: "public: __cdecl gpu::VideoMemoryUsageStats::ProcessStats::~ProcessStats(void)" (??1ProcessStats@VideoMemoryUsageStats@gpu@@QEAA@XZ) already defined in memory_stats.obj
gpu.dll.lib(gpu.dll) : error LNK2005: "public: __cdecl gpu::VideoMemoryUsageStats::VideoMemoryUsageStats(struct gpu::VideoMemoryUsageStats const &)" (??0VideoMemoryUsageStats@gpu@@QEAA@AEBU01@@Z) already defined in memory_stats.obj
./content.dll : fatal error LNK1169: one or more multiply defined symbols found
Original issue's description:
> 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}
TBR=fsamuel@chromium.org,piman@chromium.org,kenrb@chromium.org,jam@chromium.org,markdittmer@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=586367
Review URL: https://codereview.chromium.org/1726343003
Cr-Commit-Position: refs/heads/master@{#377295}
Diffstat (limited to 'gpu/BUILD.gn')
-rw-r--r-- | gpu/BUILD.gn | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gpu/BUILD.gn b/gpu/BUILD.gn index bf1d6b0..c3f82eb 100644 --- a/gpu/BUILD.gn +++ b/gpu/BUILD.gn @@ -46,7 +46,6 @@ component("gpu") { "//gpu/command_buffer/service:service_sources", "//gpu/config:config_sources", "//gpu/ipc:ipc_sources", - "//gpu/ipc/common:ipc_common_sources", ] } |