Skip to content

Commit

Permalink
Re-land just the project file changes from r55416. This makes project…
Browse files Browse the repository at this point in the history
…s that use

base test files dependent on test_support_base.

TEST=none
BUG=none

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56172 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
brettw@chromium.org committed Aug 15, 2010
1 parent 2449241 commit 426eb3a
Show file tree
Hide file tree
Showing 11 changed files with 18 additions and 1 deletion.
1 change: 1 addition & 0 deletions app/app.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
'dependencies': [
'app_base',
'app_resources',
'../base/base.gyp:test_support_base',
'../net/net.gyp:net_test_support',
'../skia/skia.gyp:skia',
'../testing/gmock.gyp:gmock',
Expand Down
3 changes: 3 additions & 0 deletions chrome/chrome_installer.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
'installer_util_strings',
'<(DEPTH)/base/base.gyp:base',
'<(DEPTH)/base/base.gyp:base_i18n',
'<(DEPTH)/base/base.gyp:test_support_base',
'<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
'<(DEPTH)/testing/gtest.gyp:gtest',
],
Expand Down Expand Up @@ -144,6 +145,7 @@
'installer_util',
'<(DEPTH)/base/base.gyp:base',
'<(DEPTH)/base/base.gyp:base_i18n',
'<(DEPTH)/base/base.gyp:test_support_base',
'<(DEPTH)/testing/gtest.gyp:gtest',
],
'include_dirs': [
Expand Down Expand Up @@ -293,6 +295,7 @@
'installer_util',
'<(DEPTH)/base/base.gyp:base',
'<(DEPTH)/base/base.gyp:base_i18n',
'<(DEPTH)/base/base.gyp:test_support_base',
'<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
'<(DEPTH)/testing/gtest.gyp:gtest',
],
Expand Down
3 changes: 3 additions & 0 deletions chrome_frame/chrome_frame.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@
'target_name': 'chrome_frame_unittests',
'type': 'executable',
'dependencies': [
'../base/base.gyp:test_support_base',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
'chrome_frame_ie',
Expand Down Expand Up @@ -219,6 +220,7 @@
'msvs_guid': '1D25715A-C8CE-4448-AFA3-8515AF22D235',
'type': 'executable',
'dependencies': [
'../base/base.gyp:test_support_base',
'../build/temp_gyp/googleurl.gyp:googleurl',
'../chrome/chrome.gyp:common',
'../chrome/chrome.gyp:utility',
Expand Down Expand Up @@ -450,6 +452,7 @@
'type': 'executable',
'msvs_guid': 'A1440368-4089-4E14-8864-D84D3C5714A7',
'dependencies': [
'../base/base.gyp:test_support_base',
'../chrome/chrome.gyp:browser',
'../chrome/chrome.gyp:renderer',
'../testing/gtest.gyp:gtest',
Expand Down
2 changes: 2 additions & 0 deletions courgette/courgette.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@
'courgette_lib',
'../base/base.gyp:base',
'../base/base.gyp:base_i18n',
'../base/base.gyp:test_support_base',
'../testing/gtest.gyp:gtest',
],
'conditions': [
Expand All @@ -117,6 +118,7 @@
'courgette_lib',
'../base/base.gyp:base',
'../base/base.gyp:base_i18n',
'../base/base.gyp:test_support_base',
'../testing/gtest.gyp:gtest',
],
'conditions': [
Expand Down
1 change: 1 addition & 0 deletions gfx/gfx.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
'dependencies': [
'gfx',
'gfx_resources',
'../base/base.gyp:test_support_base',
'../skia/skia.gyp:skia',
'../testing/gtest.gyp:gtest',
],
Expand Down
1 change: 1 addition & 0 deletions ipc/ipc.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
'ipc',
'../base/base.gyp:base',
'../base/base.gyp:base_i18n',
'../base/base.gyp:test_support_base',
'../testing/gtest.gyp:gtest',
],
'include_dirs': [
Expand Down
2 changes: 1 addition & 1 deletion jingle/jingle.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@
'sources': [
# TODO(akalin): Write our own test suite and runner.
'../base/test/run_all_unittests.cc',
'../base/test/test_suite.h',
'notifier/base/chrome_async_socket_unittest.cc',
'notifier/listener/talk_mediator_unittest.cc',
'notifier/listener/send_update_task_unittest.cc',
Expand All @@ -108,6 +107,7 @@
'dependencies': [
'notifier',
'../base/base.gyp:base',
'../base/base.gyp:test_support_base',
'../net/net.gyp:net',
'../net/net.gyp:net_test_support',
'../testing/gmock.gyp:gmock',
Expand Down
3 changes: 3 additions & 0 deletions media/media.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@
'media',
'../base/base.gyp:base',
'../base/base.gyp:base_i18n',
'../base/base.gyp:test_support_base',
'../base/base.gyp:test_support_perf',
'../testing/gtest.gyp:gtest',
'../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
Expand Down Expand Up @@ -216,6 +217,7 @@
'media',
'../base/base.gyp:base',
'../base/base.gyp:base_i18n',
'../base/base.gyp:test_support_base',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
'../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
Expand Down Expand Up @@ -533,6 +535,7 @@
'omx_wrapper',
'../base/base.gyp:base',
'../base/base.gyp:base_i18n',
'../base/base.gyp:test_support_base',
'../testing/gtest.gyp:gtest',
],
'conditions': [
Expand Down
1 change: 1 addition & 0 deletions net/net.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -663,6 +663,7 @@
'net_test_support',
'../base/base.gyp:base',
'../base/base.gyp:base_i18n',
'../base/base.gyp:test_support_base',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
'../third_party/zlib/zlib.gyp:zlib',
Expand Down
1 change: 1 addition & 0 deletions printing/printing.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@
'dependencies': [
'printing',
'../testing/gtest.gyp:gtest',
'../base/base.gyp:test_support_base',
],
'sources': [
'emf_win_unittest.cc',
Expand Down
1 change: 1 addition & 0 deletions remoting/remoting.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,7 @@
'chromoting_jingle_glue',
'../base/base.gyp:base',
'../base/base.gyp:base_i18n',
'../base/base.gyp:test_support_base',
'../gfx/gfx.gyp:gfx',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
Expand Down

0 comments on commit 426eb3a

Please sign in to comment.