diff options
| -rw-r--r-- | chrome/chrome.scons | 2 | ||||
| -rw-r--r-- | chrome/installer/util/installer_unittests.scons (renamed from chrome/installer/mini_installer/installer_unittests.scons) | 20 | ||||
| -rw-r--r-- | chrome/installer/util/util.scons | 1 |
3 files changed, 12 insertions, 11 deletions
diff --git a/chrome/chrome.scons b/chrome/chrome.scons index 0a029ff..e07b0a4 100644 --- a/chrome/chrome.scons +++ b/chrome/chrome.scons @@ -49,10 +49,10 @@ sconscript_files = env.ChromiumLoadComponentSConscripts( debugger = 'browser/debugger/debugger.scons', common = 'common/common.scons', ipc_tests = 'common/ipc_tests.scons', - installer_unittests = 'installer/mini_installer/installer_unittests.scons', mini_installer = 'installer/mini_installer/mini_installer.scons', setup = 'installer/setup/setup.scons', util = 'installer/util/util.scons', + installer_unittests = 'installer/util/installer_unittests.scons', plugin = 'plugin/plugin.scons', renderer = 'renderer/renderer.scons', activex_test_controls = diff --git a/chrome/installer/mini_installer/installer_unittests.scons b/chrome/installer/util/installer_unittests.scons index 288cda2..1e9dd9a 100644 --- a/chrome/installer/mini_installer/installer_unittests.scons +++ b/chrome/installer/util/installer_unittests.scons @@ -53,16 +53,16 @@ if env.Bit('windows'): input_files = [ '../setup/setup_constants$OBJSUFFIX', - '../util/copy_tree_work_item_unittest.cc', - '../util/create_dir_work_item_unittest.cc', - '../util/create_reg_key_work_item_unittest.cc', - '../util/delete_reg_value_work_item_unittest.cc', - '../util/delete_tree_work_item_unittest.cc', - '../util/google_chrome_distribution_unittest.cc', - '../util/helper_unittest.cc', - '../util/run_all_unittests.cc', - '../util/set_reg_value_work_item_unittest.cc', - '../util/work_item_list_unittest.cc', + 'copy_tree_work_item_unittest.cc', + 'create_dir_work_item_unittest.cc', + 'create_reg_key_work_item_unittest.cc', + 'delete_reg_value_work_item_unittest.cc', + 'delete_tree_work_item_unittest.cc', + 'google_chrome_distribution_unittest.cc', + 'helper_unittest.cc', + 'run_all_unittests.cc', + 'set_reg_value_work_item_unittest.cc', + 'work_item_list_unittest.cc', ] # TODO(port): diff --git a/chrome/installer/util/util.scons b/chrome/installer/util/util.scons index 7bba84c..6932f23 100644 --- a/chrome/installer/util/util.scons +++ b/chrome/installer/util/util.scons @@ -37,6 +37,7 @@ input_files = [ 'google_update_constants.cc', 'google_update_settings.cc', 'helper.cc', + 'html_dialog_impl.cc', 'install_util.cc', 'l10n_string_util.cc', 'logging_installer.cc', |