diff options
author | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-08 22:35:03 +0000 |
---|---|---|
committer | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-08 22:35:03 +0000 |
commit | dda0b7b7ca05ab37d35b25717d574e5c7db7cc29 (patch) | |
tree | 02bc7c64c46841d006f9687461c24dc906f8f181 /build | |
parent | 2d9b6ceafc42cb6b28b931e00350406190e13f9d (diff) | |
download | chromium_src-dda0b7b7ca05ab37d35b25717d574e5c7db7cc29.zip chromium_src-dda0b7b7ca05ab37d35b25717d574e5c7db7cc29.tar.gz chromium_src-dda0b7b7ca05ab37d35b25717d574e5c7db7cc29.tar.bz2 |
Turning on more 2010 targets.
Dropping unneeded nacl dependency on chrome frame.
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/6822010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81003 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r-- | build/all.gyp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/build/all.gyp b/build/all.gyp index 5c13347..74bdce8 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -206,9 +206,8 @@ '../base/base.gyp:base_unittests', '../chrome/chrome.gyp:browser_tests', '../chrome/chrome.gyp:interactive_ui_tests', - # TODO(bradnelson): fix and enable. - #'../chrome/chrome.gyp:nacl_ui_tests', - #'../chrome/chrome.gyp:nacl_sandbox_tests', + '../chrome/chrome.gyp:nacl_ui_tests', + '../chrome/chrome.gyp:nacl_sandbox_tests', '../chrome/chrome.gyp:safe_browsing_tests', '../chrome/chrome.gyp:sync_integration_tests', '../chrome/chrome.gyp:sync_unit_tests', @@ -229,10 +228,10 @@ ['OS=="win"', { 'dependencies': [ '../chrome/chrome.gyp:installer_util_unittests', - # TODO(bradnelson): fix and enable. - #'../chrome/chrome.gyp:mini_installer_test', + '../chrome/chrome.gyp:mini_installer_test', # mini_installer_tests depends on mini_installer. This should be # defined in installer.gyp. + # TODO(bradnelson): fix and enable. #'../chrome/installer/mini_installer.gyp:mini_installer', #'../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests', #'../chrome_frame/chrome_frame.gyp:chrome_frame_perftests', |