From 92b3094dd0c2b7ca9889bd2814a2522abe260ee8 Mon Sep 17 00:00:00 2001
From: "willchan@chromium.org"
 <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Sat, 30 Apr 2011 01:37:02 +0000
Subject: 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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83647 0039d316-1c4b-4281-b951-d872f2087c98
---
 chrome/chrome.gyp        |  1 +
 chrome/chrome_tests.gypi | 44 +++++++++++++++-----------------------------
 2 files changed, 16 insertions(+), 29 deletions(-)

(limited to 'chrome')

diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 3f53f8e..49ddd7b 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -23,6 +23,7 @@
     'chromium_dependencies': [
       'common',
       'browser',
+      'debugger',
       'profile_import',
       'renderer',
       'syncapi',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index a7069e9..67a9365 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1150,45 +1150,31 @@
       'type': 'executable',
       'msvs_guid': 'ECFC2BEC-9FC0-4AD9-9649-5F26793F65FC',
       'dependencies': [
-        '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',
-        'utility',
-        '../app/app.gyp:app_base',
-        '../app/app.gyp:app_resources',
-        '../content/content.gyp:content_gpu',
+        # 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',
-        '../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',
+        'test_support_common',
+        'test_support_sync',
+        'test_support_syncapi',
+        'test_support_unit',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
-        '../third_party/bzip2/bzip2.gyp:bzip2',
+        # 3) anything tests directly depend on
+        '../app/app.gyp:app_resources',
+        '../skia/skia.gyp:skia',
         '../third_party/cld/cld.gyp:cld',
-        '../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',
+        '../third_party/icu/icu.gyp:icui18n',
+        '../third_party/icu/icu.gyp:icuuc',
         '../ui/gfx/gl/gl.gyp:gl',
+        'chrome_resources',
+        'chrome_strings',
       ],
       'include_dirs': [
         '..',
-- 
cgit v1.1