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 /build | |
| 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 'build')
| -rw-r--r-- | build/all.gyp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/build/all.gyp b/build/all.gyp index a24ab0f..c1c400f 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -218,12 +218,16 @@ # 2) be expressed in the ui tests dependencies. '../webkit/tools/test_shell/test_shell.gyp:test_shell_common', 'temp_gyp/googleurl.gyp:googleurl_unittests', + '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests', + '../chrome_frame/chrome_frame.gyp:chrome_frame_perftests', '../chrome_frame/chrome_frame.gyp:chrome_frame_tests', '../chrome_frame/chrome_frame.gyp:chrome_frame_unittests', - '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests', + '../chrome_frame/chrome_frame.gyp:npchrome_frame', ], }, { + # TODO(robertshield): Remove this target once the last independent + # CF builder is retired. 'target_name': 'chrome_frame_builder', 'type': 'none', 'dependencies': [ |