diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-30 05:55:47 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-30 05:55:47 +0000 |
| commit | 4f705b53daef7ac8f5bc34d5fb2e8b6ef6795cee (patch) | |
| tree | 5b58bd5a7f6f599db9e08435965fb81ca54c4930 /chrome/installer | |
| parent | d1b13d7b10e2edeb4faf23caec84a9851c0b3aa7 (diff) | |
| download | chromium_src-4f705b53daef7ac8f5bc34d5fb2e8b6ef6795cee.zip chromium_src-4f705b53daef7ac8f5bc34d5fb2e8b6ef6795cee.tar.gz chromium_src-4f705b53daef7ac8f5bc34d5fb2e8b6ef6795cee.tar.bz2 | |
Revert r4205 to track down buildbot unit_tests failure.
Review URL: http://codereview.chromium.org/8730
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4206 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer')
| -rw-r--r-- | chrome/installer/mini_installer/SConscript | 5 | ||||
| -rw-r--r-- | chrome/installer/setup/SConscript | 1 | ||||
| -rw-r--r-- | chrome/installer/util/SConscript | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/chrome/installer/mini_installer/SConscript b/chrome/installer/mini_installer/SConscript index bce8d00..606a112 100644 --- a/chrome/installer/mini_installer/SConscript +++ b/chrome/installer/mini_installer/SConscript @@ -52,7 +52,7 @@ env.Prepend( '/DYNAMICBASE:NO', '/PDB:${TARGETS[1]}', - #'/MAP:${TARGETS[2]}', + '/MAP:${TARGETS[2]}', ], LIBS = [ 'shlwapi.lib', @@ -64,8 +64,7 @@ env['CCFLAGS'].remove('/RTC1') components = [ "$VISUAL_STUDIO/VC/crt/src/intel/mt_lib/memset.obj", "$VISUAL_STUDIO/VC/crt/src/intel/mt_lib/P4_memset.obj", - #"$TARGET_ROOT/chrome_dll.lib", - "$TARGET_ROOT/chrome.lib", + "$TARGET_ROOT/chrome_dll.lib", ] input_files = [ diff --git a/chrome/installer/setup/SConscript b/chrome/installer/setup/SConscript index e754c56..3c99c45 100644 --- a/chrome/installer/setup/SConscript +++ b/chrome/installer/setup/SConscript @@ -61,6 +61,7 @@ env.Prepend( '/nxcompat', '/PDB:${TARGETS[1]}', + '/MAP:${TARGETS[2]}', ], LIBS = [ 'msi.lib', diff --git a/chrome/installer/util/SConscript b/chrome/installer/util/SConscript index eaa9fb5..fde62a7a 100644 --- a/chrome/installer/util/SConscript +++ b/chrome/installer/util/SConscript @@ -38,6 +38,7 @@ env.Prepend( ) input_files = [ + '../../app/google_update_settings$OBJSUFFIX', 'browser_distribution.cc', 'copy_tree_work_item.cc', 'create_dir_work_item.cc', |