Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(414)

Unified Diff: build/all.gyp

Issue 9315009: Enable Aura for all ChromeOS builds in Chromium. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: updated target/ Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | build/common.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/all.gyp
diff --git a/build/all.gyp b/build/all.gyp
index 1bcac1ee06e2989161f70cccd2c0108f26766446..b8aac32e66595cbcfec3381c2c13da65a7764847 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
« no previous file with comments | « no previous file | build/common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698