diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-05-11 20:53:37 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-05-16 13:54:48 +0100 |
| commit | 21d179b334e59e9a3bfcaed4c4430bef1bc5759d (patch) | |
| tree | 64e2bb6da27af6a5c93ca34f6051584aafbfcb9e /build/all.gyp | |
| parent | 0c63f00edd6ed0482fd5cbcea937ca088baf7858 (diff) | |
| download | external_chromium-21d179b334e59e9a3bfcaed4c4430bef1bc5759d.zip external_chromium-21d179b334e59e9a3bfcaed4c4430bef1bc5759d.tar.gz external_chromium-21d179b334e59e9a3bfcaed4c4430bef1bc5759d.tar.bz2 | |
Merge Chromium at 10.0.621.0: Initial merge by git.
Change-Id: I070cc91c608dfa4a968a5a54c173260765ac8097
Diffstat (limited to 'build/all.gyp')
| -rw-r--r-- | build/all.gyp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/build/all.gyp b/build/all.gyp index 79453dd..46d550d 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -33,7 +33,6 @@ '../third_party/ffmpeg/ffmpeg.gyp:*', '../third_party/iccjpeg/iccjpeg.gyp:*', '../third_party/icu/icu.gyp:*', - '../third_party/libjpeg/libjpeg.gyp:*', '../third_party/libpng/libpng.gyp:*', '../third_party/libwebp/libwebp.gyp:*', '../third_party/libxml/libxml.gyp:*', @@ -51,6 +50,7 @@ '../webkit/webkit.gyp:*', 'util/build_util.gyp:*', 'temp_gyp/googleurl.gyp:*', + '<(libjpeg_gyp_path):*', ], 'conditions': [ ['javascript_engine=="v8"', { @@ -197,7 +197,15 @@ ], }], ], - } + }, + { + 'target_name': 'chromium_gpu_builder', + 'type': 'none', + 'dependencies': [ + '../chrome/chrome.gyp:gpu_tests', + '../third_party/WebKit/WebKit/chromium/WebKit.gyp:DumpRenderTree', + ], + } ], 'conditions': [ ['OS=="mac"', { @@ -296,6 +304,7 @@ '../net/net.gyp:net_unittests', '../printing/printing.gyp:printing_unittests', '../remoting/remoting.gyp:remoting_unittests', + '../chrome/chrome.gyp:safe_browsing_tests', '../chrome/chrome.gyp:sync_unit_tests', '../chrome/chrome.gyp:unit_tests', '../chrome/chrome.gyp:ui_tests', @@ -391,7 +400,6 @@ '../chrome/app/locales/locales.gyp:*', '../chrome/chrome.gyp:crash_service', '../chrome/chrome.gyp:page_cycler_tests', - '../chrome/chrome.gyp:policy_templates', '../chrome/chrome.gyp:pyautolib', '../chrome/chrome.gyp:reliability_tests', '../chrome/chrome.gyp:startup_tests', |