diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-05 23:19:24 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-05 23:19:24 +0000 |
| commit | fb5726501682d212e05ab977fa3975b976076b9a (patch) | |
| tree | d5edfbd57eaf9018a51abd332c08e0d24814705a | |
| parent | a048ea67799ae6c42589496ba18e62cea9a3dee5 (diff) | |
| download | chromium_src-fb5726501682d212e05ab977fa3975b976076b9a.zip chromium_src-fb5726501682d212e05ab977fa3975b976076b9a.tar.gz chromium_src-fb5726501682d212e05ab977fa3975b976076b9a.tar.bz2 | |
sync: Specify linking dependencies correctly. The browser library contains lots of files in chrome/browser/sync. They need to depend on the syncapi library and not just sync_proto.
BUG=none
TEST=Random CLs don't trigger linking errors.
TBR=nick
Review URL: http://codereview.chromium.org/1564010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43675 0039d316-1c4b-4281-b951-d872f2087c98
| -rwxr-xr-x | chrome/chrome_browser.gypi | 1 | ||||
| -rw-r--r-- | chrome/chrome_tests.gypi | 8 |
2 files changed, 2 insertions, 7 deletions
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 2ce186e..96ba447 100755 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -16,6 +16,7 @@ 'net_internals_resources', 'platform_locale_settings', 'sync_proto', + 'syncapi', 'theme_resources', '../app/app.gyp:app_resources', '../app/app.gyp:app_strings', diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index bee3e7e..af6a741 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -252,7 +252,6 @@ 'common', 'chrome_resources', 'chrome_strings', - 'syncapi', 'test_support_ui', '../base/base.gyp:base', '../net/net.gyp:net', @@ -431,7 +430,6 @@ 'common', 'chrome_resources', 'chrome_strings', - 'syncapi', 'test_support_ui', '../base/base.gyp:base', '../build/temp_gyp/googleurl.gyp:googleurl', @@ -483,15 +481,14 @@ 'type': 'executable', 'msvs_guid': 'ECFC2BEC-9FC0-4AD9-9649-5F26793F65FC', 'dependencies': [ - 'chrome', 'browser', + 'chrome', 'chrome_resources', 'chrome_strings', 'common', 'debugger', 'renderer', 'sync_proto', - 'syncapi', 'test_support_unit', 'utility', '../app/app.gyp:app_base', @@ -1181,7 +1178,6 @@ 'chrome_resources', 'chrome_strings', 'debugger', - 'syncapi', 'renderer', 'test_support_common', '../app/app.gyp:app_base', @@ -1734,7 +1730,6 @@ 'renderer', 'chrome_resources', 'chrome_strings', - 'syncapi', 'sync_proto', 'test_support_unit', '../net/net.gyp:net_test_support', @@ -1838,7 +1833,6 @@ 'common', 'debugger', 'renderer', - 'syncapi', 'chrome_resources', 'chrome_strings', '../app/app.gyp:app_base', |