diff options
| author | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-25 13:29:50 +0000 |
|---|---|---|
| committer | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-25 13:29:50 +0000 |
| commit | 73ecdb223fb598a99d64b20c600aa03ef45f171b (patch) | |
| tree | 9f36b5aaf25f41a018d0b69526d7f05b92300455 /build/all.gyp | |
| parent | 8a188747a04f5e9c8664df54f6fa65bda11ebbae (diff) | |
| download | chromium_src-73ecdb223fb598a99d64b20c600aa03ef45f171b.zip chromium_src-73ecdb223fb598a99d64b20c600aa03ef45f171b.tar.gz chromium_src-73ecdb223fb598a99d64b20c600aa03ef45f171b.tar.bz2 | |
Have aura_builder build Chrome Frame and its tests.
BUG=223560
Review URL: https://chromiumcodereview.appspot.com/14034019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196388 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/all.gyp')
| -rw-r--r-- | build/all.gyp | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/build/all.gyp b/build/all.gyp index eccae46..f2f6853 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -775,6 +775,24 @@ ['OS=="win"', { 'dependencies': [ '../chrome/chrome.gyp:crash_service', + '../chrome_frame/chrome_frame.gyp:npchrome_frame', + ], + }], + ['OS=="win" and target_arch!="x64"', { + 'dependencies': [ + '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests', + '../chrome_frame/chrome_frame.gyp:chrome_frame_perftests', + '../chrome_frame/chrome_frame.gyp:chrome_frame_reliability_tests', + '../chrome_frame/chrome_frame.gyp:chrome_frame_tests', + '../chrome_frame/chrome_frame.gyp:chrome_frame_unittests', + ], + }], + ['OS=="win" and target_arch=="x64"', { + 'dependencies!': [ + '../chrome_frame/chrome_frame.gyp:npchrome_frame', + ], + 'defines': [ + 'OMIT_CHROME_FRAME', ], }], ['OS=="win" and target_arch=="ia32"', { |