diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-10 02:42:32 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-10 02:42:32 +0000 |
| commit | bc052ef50ea866505334ac37db8a163550723ccf (patch) | |
| tree | 08086b6eb70045abef716636ea735a44b3eefb23 | |
| parent | b3481b7bdfa5624d5e953ed1a03e3120e5cd656d (diff) | |
| download | chromium_src-bc052ef50ea866505334ac37db8a163550723ccf.zip chromium_src-bc052ef50ea866505334ac37db8a163550723ccf.tar.gz chromium_src-bc052ef50ea866505334ac37db8a163550723ccf.tar.bz2 | |
Fix for the shared library build issue. This reverts my previous two tries which werer incorrect. perftimer just needed to be added to test_support_base.
TEST=it compiles
BUG=none
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62099 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | app/app.gyp | 1 | ||||
| -rw-r--r-- | base/base.gyp | 1 | ||||
| -rw-r--r-- | chrome/chrome_tests.gypi | 16 |
3 files changed, 1 insertions, 17 deletions
diff --git a/app/app.gyp b/app/app.gyp index 14a2b93..2c8e7f7 100644 --- a/app/app.gyp +++ b/app/app.gyp @@ -26,7 +26,6 @@ 'dependencies': [ 'app_base', 'app_resources', - '../base/base.gyp:base', '../base/base.gyp:test_support_base', '../net/net.gyp:net_test_support', '../skia/skia.gyp:skia', diff --git a/base/base.gyp b/base/base.gyp index 1c76ee1..10a9e61 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -251,6 +251,7 @@ }], ], 'sources': [ + 'perftimer.cc', 'test/multiprocess_test.cc', 'test/multiprocess_test.h', 'test/perf_test_suite.cc', diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 66dece7..4bea7d5 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -228,7 +228,6 @@ 'test_support_ui', 'theme_resources', '../base/base.gyp:base', - '../base/base.gyp:test_support_base', '../skia/skia.gyp:skia', '../third_party/libxml/libxml.gyp:libxml', '../testing/gtest.gyp:gtest', @@ -274,8 +273,6 @@ 'chrome.gyp:test_support_ui', 'chrome.gyp:syncapi', 'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp', - '../base/base.gyp:base', - '../base/base.gyp:test_support_base', '../third_party/hunspell/hunspell.gyp:hunspell', '../net/net.gyp:net_resources', '../net/net.gyp:net_test_support', @@ -637,7 +634,6 @@ 'syncapi', 'test_support_ui', '../base/base.gyp:base', - '../base/base.gyp:test_support_base', '../build/temp_gyp/googleurl.gyp:googleurl', '../net/net.gyp:net', '../skia/skia.gyp:skia', @@ -870,7 +866,6 @@ 'chrome_strings', 'test_support_ui', '../base/base.gyp:base', - '../base/base.gyp:test_support_base', '../build/temp_gyp/googleurl.gyp:googleurl', '../net/net.gyp:net', '../skia/skia.gyp:skia', @@ -944,8 +939,6 @@ 'utility', '../app/app.gyp:app_base', '../app/app.gyp:app_resources', - '../base/base.gyp:base', - '../base/base.gyp:test_support_base', '../ipc/ipc.gyp:ipc', '../media/media.gyp:media_test_support', '../net/net.gyp:net_resources', @@ -2231,7 +2224,6 @@ 'test_support_ui', '../app/app.gyp:app_base', '../base/base.gyp:base', - '../base/base.gyp:test_support_base', '../skia/skia.gyp:skia', '../testing/gtest.gyp:gtest', ], @@ -2350,7 +2342,6 @@ 'test_support_common', 'test_support_ui', '../base/base.gyp:base', - '../base/base.gyp:test_support_base', '../skia/skia.gyp:skia', '../testing/gtest.gyp:gtest', ], @@ -2385,7 +2376,6 @@ 'test_support_ui', 'theme_resources', '../base/base.gyp:base', - '../base/base.gyp:test_support_base', '../skia/skia.gyp:skia', '../testing/gtest.gyp:gtest', ], @@ -2420,7 +2410,6 @@ 'test_support_ui', 'theme_resources', '../base/base.gyp:base', - '../base/base.gyp:test_support_base', '../skia/skia.gyp:skia', '../testing/gtest.gyp:gtest', ], @@ -2450,7 +2439,6 @@ 'test_support_ui', 'theme_resources', '../base/base.gyp:base', - '../base/base.gyp:test_support_base', '../net/net.gyp:net', '../skia/skia.gyp:skia', '../testing/gtest.gyp:gtest', @@ -2537,8 +2525,6 @@ 'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp', 'common', 'debugger', - '../base/base.gyp:base', - '../base/base.gyp:test_support_base', '../skia/skia.gyp:skia', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', @@ -2620,8 +2606,6 @@ 'renderer', 'chrome_strings', 'test_support_common', - '../base/base.gyp:base', - '../base/base.gyp:test_support_base', '../net/net.gyp:net_test_support', '../printing/printing.gyp:printing', '../skia/skia.gyp:skia', |