Split installer.gyp and add installer_util_nacl_win64 target....

chrome/installer/installer.gyp

Index: chrome/installer/installer.gyp
===================================================================
--- chrome/installer/installer.gyp	(revision 33860)
+++ chrome/installer/installer.gyp	(working copy)
@@ -5,87 +5,16 @@
     'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE',
     # 'branding_dir' is set in the 'conditions' section at the bottom.
   },
+  'includes': [
+    # Two versions of installer_util target are defined in installer_util.gypi.
+    # This allows to keep all the settings relevant to these targets in one
+    # place.
+    'installer_util.gypi',
+  ],
   'conditions': [
     ['OS=="win"', {
       'targets': [
         {
-          'target_name': 'installer_util',
-          'type': '<(library)',
-          'msvs_guid': 'EFBB1436-A63F-4CD8-9E99-B89226E782EC',
-          'dependencies': [
-            '../../app/app.gyp:app_id',
-            'installer_util_strings',
-            '../chrome.gyp:common_constants',
-            '../chrome.gyp:chrome_resources',
-            '../chrome.gyp:chrome_strings',
-            '../../courgette/courgette.gyp:courgette_lib',
-            '../../third_party/bspatch/bspatch.gyp:bspatch',
-            '../../third_party/icu/icu.gyp:icui18n',
-            '../../third_party/icu/icu.gyp:icuuc',
-            '../../third_party/libxml/libxml.gyp:libxml',
-            '../../third_party/lzma_sdk/lzma_sdk.gyp:lzma_sdk',
-          ],
-          'include_dirs': [
-            '../..',
-          ],
-          'sources': [
-            'util/browser_distribution.cc',
-            'util/browser_distribution.h',
-            'util/chrome_frame_distribution.cc',
-            'util/chrome_frame_distribution.h',
-            'util/compat_checks.cc',
-            'util/compat_checks.h',
-            'util/copy_tree_work_item.cc',
-            'util/copy_tree_work_item.h',
-            'util/create_dir_work_item.cc',
-            'util/create_dir_work_item.h',
-            'util/create_reg_key_work_item.cc',
-            'util/create_reg_key_work_item.h',
-            'util/delete_after_reboot_helper.cc',
-            'util/delete_after_reboot_helper.h',
-            'util/delete_reg_value_work_item.cc',
-            'util/delete_reg_value_work_item.h',
-            'util/delete_tree_work_item.cc',
-            'util/delete_tree_work_item.h',
-            'util/google_chrome_distribution.cc',
-            'util/google_chrome_distribution.h',
-            'util/google_update_constants.cc',
-            'util/google_update_constants.h',
-            'util/google_update_settings.cc',
-            'util/google_update_settings.h',
-            'util/helper.cc',
-            'util/helper.h',
-            'util/html_dialog.h',
-            'util/html_dialog_impl.cc',
-            'util/install_util.cc',
-            'util/install_util.h',
-            'util/l10n_string_util.cc',
-            'util/l10n_string_util.h',
-            'util/logging_installer.cc',
-            'util/logging_installer.h',
-            'util/lzma_util.cc',
-            'util/lzma_util.h',
-            'util/master_preferences.cc',
-            'util/master_preferences.h',
-            'util/move_tree_work_item.cc',
-            'util/move_tree_work_item.h',
-            'util/self_reg_work_item.cc',
-            'util/self_reg_work_item.h',
-            'util/set_reg_value_work_item.cc',
-            'util/set_reg_value_work_item.h',
-            'util/shell_util.cc',
-            'util/shell_util.h',
-            'util/util_constants.cc',
-            'util/util_constants.h',
-            'util/version.cc',
-            'util/version.h',
-            'util/work_item.cc',
-            'util/work_item.h',
-            'util/work_item_list.cc',
-            'util/work_item_list.h',
-          ],
-        },
-        {
           'target_name': 'gcapi_dll',
           'type': 'loadable_module',
           'msvs_guid': 'B802A2FE-E4E2-4F5A-905A-D5128875C954',