diff options
| author | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-02 21:40:05 +0000 |
|---|---|---|
| committer | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-02 21:40:05 +0000 |
| commit | 24c7ac4a615df286062d971b5b681b9020dec4d7 (patch) | |
| tree | c3a13e909b5ffdbba70f4a10e846ef62c108d8d7 /build | |
| parent | 1b11e9917ee936f96019cf859fa4b0eca32fdeed (diff) | |
| download | chromium_src-24c7ac4a615df286062d971b5b681b9020dec4d7.zip chromium_src-24c7ac4a615df286062d971b5b681b9020dec4d7.tar.gz chromium_src-24c7ac4a615df286062d971b5b681b9020dec4d7.tar.bz2 | |
Enable Aura for all ChromeOS builds in Chromium.
This will be landed after this: https://gerrit.chromium.org/gerrit/#change,14752
BUG=112154
TEST=build with chromeos==1 in gyp and see Aura desktop.
Review URL: https://chromiumcodereview.appspot.com/9315009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120240 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/all.gyp | 49 | ||||
| -rw-r--r-- | build/common.gypi | 4 |
2 files changed, 27 insertions, 26 deletions
diff --git a/build/all.gyp b/build/all.gyp index 1bcac1ee0..b8aac32 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -527,40 +527,41 @@ { 'target_name': 'chromeos_builder', 'type': 'none', - 'sources': [ - # TODO(bradnelson): This is here to work around gyp issue 137. - # Remove this sources list when that issue has been fixed. - 'all.gyp', - ], '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: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:sync_integration_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', - '../ui/ui.gyp:gfx_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', + #'../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', + #'../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests', + '../ui/aura/aura.gyp:*', + '../ui/gfx/compositor/compositor.gyp:*', + '../ui/ui.gyp:gfx_unittests', + '../ui/views/views.gyp:views', '../ui/views/views.gyp:views_unittests', - 'temp_gyp/googleurl.gyp:googleurl_unittests', + '../webkit/webkit.gyp:pull_in_webkit_unit_tests', + #'temp_gyp/googleurl.gyp:googleurl_unittests', ], }, ], # targets diff --git a/build/common.gypi b/build/common.gypi index 3446354..418ce89 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -63,8 +63,8 @@ '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/arm.*/arm/;s/i86pc/ia32/")', }], - # Ash requires Aura. - ['use_ash==1', { + # Ash and ChromeOS require Aura. + ['use_ash==1 or chromeos==1', { 'use_aura%': 1, }], |