diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-30 01:41:40 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-30 01:41:40 +0000 |
| commit | f402503e9d2461d38f864560edac4c62b245a427 (patch) | |
| tree | edc77145937f09381e2b705774a2eb31ce3d6361 /chrome/chrome_tests.gypi | |
| parent | 92b3094dd0c2b7ca9889bd2814a2522abe260ee8 (diff) | |
| download | chromium_src-f402503e9d2461d38f864560edac4c62b245a427.zip chromium_src-f402503e9d2461d38f864560edac4c62b245a427.tar.gz chromium_src-f402503e9d2461d38f864560edac4c62b245a427.tar.bz2 | |
Revert 83647 (broke build) - I'm tired of waiting for chrome to link before unit_tests starts to build.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6905142
TBR=willchan@chromium.org
Review URL: http://codereview.chromium.org/6902188
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83648 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_tests.gypi')
| -rw-r--r-- | chrome/chrome_tests.gypi | 44 |
1 files changed, 29 insertions, 15 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 67a9365..a7069e9 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -1150,31 +1150,45 @@ 'type': 'executable', 'msvs_guid': 'ECFC2BEC-9FC0-4AD9-9649-5F26793F65FC', 'dependencies': [ - # unit tests should only depend on - # 1) everything that the chrome binaries depend on: - '<@(chromium_dependencies)', - # 2) test-specific support libraries: - '../gpu/gpu.gyp:gpu_unittest_utils', - '../jingle/jingle.gyp:jingle_glue_test_util', - '../media/media.gyp:media_test_support', - '../net/net.gyp:net_test_support', + 'browser', + 'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp', + 'chrome', + 'chrome_resources', + 'chrome_strings', + 'common', + 'in_memory_url_index_cache_proto_cpp', + 'profile_import', + 'renderer', + 'service', 'test_support_common', 'test_support_sync', 'test_support_syncapi', 'test_support_unit', - '../testing/gmock.gyp:gmock', - '../testing/gtest.gyp:gtest', - # 3) anything tests directly depend on + 'utility', + '../app/app.gyp:app_base', '../app/app.gyp:app_resources', + '../content/content.gyp:content_gpu', + '../gpu/gpu.gyp:gpu_unittest_utils', + '../ipc/ipc.gyp:ipc', + '../jingle/jingle.gyp:jingle_glue_test_util', + '../media/media.gyp:media_test_support', + '../net/net.gyp:net_resources', + '../net/net.gyp:net_test_support', + '../printing/printing.gyp:printing', + '../webkit/support/webkit_support.gyp:webkit_resources', '../skia/skia.gyp:skia', + '../testing/gmock.gyp:gmock', + '../testing/gtest.gyp:gtest', + '../third_party/bzip2/bzip2.gyp:bzip2', '../third_party/cld/cld.gyp:cld', - '../third_party/libjingle/libjingle.gyp:libjingle', - '../third_party/libxml/libxml.gyp:libxml', + '../third_party/expat/expat.gyp:expat', '../third_party/icu/icu.gyp:icui18n', '../third_party/icu/icu.gyp:icuuc', + '../third_party/libjingle/libjingle.gyp:libjingle', + '../third_party/libxml/libxml.gyp:libxml', + '../third_party/npapi/npapi.gyp:npapi', + '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', '../ui/gfx/gl/gl.gyp:gl', - 'chrome_resources', - 'chrome_strings', ], 'include_dirs': [ '..', |