summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build/SConscript.v84
-rw-r--r--chrome/installer/mini_installer/SConscript2
-rw-r--r--chrome/installer/util/SConscript1
-rw-r--r--chrome/renderer/SConscript1
4 files changed, 5 insertions, 3 deletions
diff --git a/build/SConscript.v8 b/build/SConscript.v8
index b3ec128..7abd7e2 100644
--- a/build/SConscript.v8
+++ b/build/SConscript.v8
@@ -60,8 +60,8 @@ env.Alias('webkit', i)
i = env.Install('$TARGET_ROOT', v8_exe)
env.Alias('chrome', i)
-# To satisfy tests expecting the name v8_shell.exe.
-i = env.InstallAs('$TARGET_ROOT/v8_shell.exe', v8_exe)
+# To satisfy tests expecting the following .exe name.
+i = env.InstallAs('$TARGET_ROOT/v8_shell_sample.exe', v8_exe)
env.Alias('chrome', i)
# Tell our SCons invocation to *not* delete v8.lib and the other targets
diff --git a/chrome/installer/mini_installer/SConscript b/chrome/installer/mini_installer/SConscript
index 5a99a21..6c740e4 100644
--- a/chrome/installer/mini_installer/SConscript
+++ b/chrome/installer/mini_installer/SConscript
@@ -174,8 +174,8 @@ input_files = [
'../util/create_dir_work_item_unittest.cc',
'../util/create_reg_key_work_item_unittest.cc',
'../util/delete_tree_work_item_unittest.cc',
+ '../util/google_chrome_distribution_unittest.cc',
'../util/helper_unittest.cc',
- '../util/install_util_unittest.cc',
'../util/run_all_unittests.cc',
'../util/set_reg_value_work_item_unittest.cc',
'../util/work_item_list_unittest.cc',
diff --git a/chrome/installer/util/SConscript b/chrome/installer/util/SConscript
index e45296d..c826c63 100644
--- a/chrome/installer/util/SConscript
+++ b/chrome/installer/util/SConscript
@@ -68,6 +68,7 @@ input_files = [
'create_dir_work_item.cc',
'create_reg_key_work_item.cc',
'delete_tree_work_item.cc',
+ 'google_chrome_distribution.cc',
'google_update_constants.cc',
'google_update_settings.cc',
'helper.cc',
diff --git a/chrome/renderer/SConscript b/chrome/renderer/SConscript
index a10793e..6a7e0c2 100644
--- a/chrome/renderer/SConscript
+++ b/chrome/renderer/SConscript
@@ -65,6 +65,7 @@ input_files = [
'debug_message_handler.cc',
'dom_ui_bindings.cc',
'external_js_object.cc',
+ 'external_host_bindings.cc',
'localized_error.cc',
'net/render_dns_master.cc',
'net/render_dns_queue.cc',