diff options
| author | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-08 23:45:54 +0000 |
|---|---|---|
| committer | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-08 23:45:54 +0000 |
| commit | 145f40d8a31033d6f591af7edca970e19963f8ec (patch) | |
| tree | 6248237612be735b0e61ffb3b54cac58765fb771 /build | |
| parent | 7e1f5e02e91002563a90c031999face8db78ee3c (diff) | |
| download | chromium_src-145f40d8a31033d6f591af7edca970e19963f8ec.zip chromium_src-145f40d8a31033d6f591af7edca970e19963f8ec.tar.gz chromium_src-145f40d8a31033d6f591af7edca970e19963f8ec.tar.bz2 | |
Fix build Linux ChromeOS GTK bot on the main waterfall.
TBR=oshima@chromium.org
BUG=112962
TEST=Linux ChromeOS GTK bot not broken on the main waterfall
Review URL: https://chromiumcodereview.appspot.com/9358044
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121091 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/all.gyp | 49 |
1 files changed, 22 insertions, 27 deletions
diff --git a/build/all.gyp b/build/all.gyp index ee4741e..8e813dd 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -521,50 +521,45 @@ }], # branding=="Chrome" ], # conditions }], # OS="win" - ['chromeos==1', { + # Old ChromeOS target needed to build pre-Aura targets. + ['chromeos_gtk==1', { 'targets': [ { 'target_name': 'chromeos_builder', 'type': 'none', 'dependencies': [ - '../ash/ash.gyp:ash_shell', - '../ash/ash.gyp:aura_shell_unittests', '../base/base.gyp:base_unittests', - #'../chrome/chrome.gyp:browser_tests', + '../chrome/chrome.gyp:browser_tests', '../chrome/chrome.gyp:chrome', - #'../chrome/chrome.gyp:interactive_ui_tests', - #'../chrome/chrome.gyp:performance_browser_tests', - #'../chrome/chrome.gyp:performance_ui_tests', - #'../chrome/chrome.gyp:safe_browsing_tests', - #'../chrome/chrome.gyp:sync_integration_tests', + '../chrome/chrome.gyp:interactive_ui_tests', + '../chrome/chrome.gyp:performance_browser_tests', + '../chrome/chrome.gyp:performance_ui_tests', + '../chrome/chrome.gyp:safe_browsing_tests', + '../chrome/chrome.gyp:sync_integration_tests', '../chrome/chrome.gyp:sync_unit_tests', '../chrome/chrome.gyp:ui_tests', '../chrome/chrome.gyp:unit_tests', - #'../content/content.gyp:content_browsertests', + '../content/content.gyp:content_browsertests', '../content/content.gyp:content_unittests', - #'../crypto/crypto.gyp:crypto_unittests', - #'../dbus/dbus.gyp:dbus_unittests', + '../crypto/crypto.gyp:crypto_unittests', + '../dbus/dbus.gyp:dbus_unittests', '../ipc/ipc.gyp:ipc_tests', - #'../jingle/jingle.gyp:jingle_unittests', - #'../media/media.gyp:ffmpeg_tests', - #'../media/media.gyp:media_unittests', - #'../net/net.gyp:net_unittests', - #'../printing/printing.gyp:printing_unittests', - #'../remoting/remoting.gyp:remoting_unittests', + '../jingle/jingle.gyp:jingle_unittests', + '../media/media.gyp:ffmpeg_tests', + '../media/media.gyp:media_unittests', + '../net/net.gyp:net_unittests', + '../printing/printing.gyp:printing_unittests', + '../remoting/remoting.gyp:remoting_unittests', '../sql/sql.gyp:sql_unittests', - #'../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', - #'../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests', - '../ui/aura/aura.gyp:*', - '../ui/gfx/compositor/compositor.gyp:*', + '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', + '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests', '../ui/ui.gyp:gfx_unittests', - '../ui/views/views.gyp:views', '../ui/views/views.gyp:views_unittests', - '../webkit/webkit.gyp:pull_in_webkit_unit_tests', - #'temp_gyp/googleurl.gyp:googleurl_unittests', + 'temp_gyp/googleurl.gyp:googleurl_unittests', ], }, - ], # targets - }], # "chromeos==1" + ], # targets + }], # "chromeos_gtk==1" ['use_aura==1', { 'targets': [ { |