diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-08 14:27:21 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-08 14:27:21 +0000 |
| commit | 5187d924c1eb608f267ba337c45765cade29baf5 (patch) | |
| tree | ed6f29db2a7493c25593b8b3e89c7ef5933e00fa /chrome_frame | |
| parent | 1fbe08754b21f96809a8832e29f74b6031afbfe7 (diff) | |
| download | chromium_src-5187d924c1eb608f267ba337c45765cade29baf5.zip chromium_src-5187d924c1eb608f267ba337c45765cade29baf5.tar.gz chromium_src-5187d924c1eb608f267ba337c45765cade29baf5.tar.bz2 | |
Correct Chrome Frame dependencies such that a) CF tests depend on the CF DLL b) all.gyp:chromium_builder will build CF stuff.
BUG=CF dll and chrome_launcher.exe were not getting built on the chromium-rel builder.
TEST=No more BUG.
Review URL: http://codereview.chromium.org/517065
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35788 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/chrome_frame.gyp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp index 764ec79..b75369b 100644 --- a/chrome_frame/chrome_frame.gyp +++ b/chrome_frame/chrome_frame.gyp @@ -176,6 +176,7 @@ '../third_party/libxslt/libxslt.gyp:libxslt', 'chrome_frame_strings', 'chrome_frame_npapi', + 'npchrome_frame', 'xulrunner_sdk', ], 'sources': [ @@ -253,6 +254,7 @@ '../third_party/libxml/libxml.gyp:libxml', '../third_party/libxslt/libxslt.gyp:libxslt', 'chrome_frame_strings', + 'npchrome_frame', 'xulrunner_sdk', ], 'sources': [ @@ -313,6 +315,7 @@ '../third_party/icu/icu.gyp:icui18n', '../third_party/icu/icu.gyp:icuuc', 'chrome_frame_npapi', + 'npchrome_frame', ], 'sources': [ '../net/url_request/url_request_unittest.cc', @@ -611,12 +614,6 @@ '../chrome/chrome.gyp:common', '../chrome/chrome.gyp:utility', '../build/temp_gyp/googleurl.gyp:googleurl', - # FIXME(slightlyoff): - # gigantic hack to get these to build from main Chrome sln. - 'chrome_frame_perftests', - 'chrome_frame_tests', - 'chrome_frame_unittests', - 'chrome_frame_net_tests', ], 'sources': [ 'chrome_frame_npapi.rgs', |