diff options
author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-05 17:56:39 +0000 |
---|---|---|
committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-05 17:56:39 +0000 |
commit | 3339229822e7af543067d5267d3b9795bd6e4485 (patch) | |
tree | 76d893bdea7b1895303aad3c265cbb0946c5154f /media/media.gyp | |
parent | 8cb02edc531a8334b2bd48087a91b4cbdf40c2d7 (diff) | |
download | chromium_src-3339229822e7af543067d5267d3b9795bd6e4485.zip chromium_src-3339229822e7af543067d5267d3b9795bd6e4485.tar.gz chromium_src-3339229822e7af543067d5267d3b9795bd6e4485.tar.bz2 |
Move lots of GMock stuff out of line.
Nico did some treemapping of our build time on Mac, and (surprise!) gmock
unittests dominated. Gmock works with several large, heavy templates, and previous patches that out of line the ctors/dtors have significantly sped up compilation (e.g.GLMock) and have reduced thrashing.
Nico says I should plug this again: http://www.chromium.org/developers/coding-style/cpp-dos-and-donts
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6056008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70516 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/media.gyp')
-rw-r--r-- | media/media.gyp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/media/media.gyp b/media/media.gyp index 6fe8e83..0a02903 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -1,4 +1,4 @@ -# Copyright (c) 2010 The Chromium Authors. All rights reserved. +# Copyright (c) 2011 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -211,6 +211,7 @@ 'type': 'executable', 'dependencies': [ 'media', + 'media_test_support', '../base/base.gyp:base', '../base/base.gyp:base_i18n', '../base/base.gyp:test_support_base', @@ -246,6 +247,7 @@ 'msvs_guid': 'C8C6183C-B03C-11DD-B471-DFD256D89593', 'dependencies': [ 'media', + 'media_test_support', '../base/base.gyp:base', '../base/base.gyp:base_i18n', '../base/base.gyp:test_support_base', @@ -275,10 +277,8 @@ 'base/filter_collection_unittest.cc', 'base/mock_ffmpeg.cc', 'base/mock_ffmpeg.h', - 'base/mock_filter_host.h', - 'base/mock_filters.cc', - 'base/mock_filters.h', 'base/mock_reader.h', + 'base/mock_task.cc', 'base/mock_task.h', 'base/pipeline_impl_unittest.cc', 'base/pts_heap_unittest.cc', @@ -328,10 +328,16 @@ 'dependencies': [ 'media', '../base/base.gyp:base', + '../testing/gmock.gyp:gmock', + '../testing/gtest.gyp:gtest', ], 'sources': [ 'audio/test_audio_input_controller_factory.cc', 'audio/test_audio_input_controller_factory.h', + 'base/mock_filter_host.cc', + 'base/mock_filter_host.h', + 'base/mock_filters.cc', + 'base/mock_filters.h', ], }, { |