Always embed manifests, even in component builds!

chrome/tools/build/win/create_installer_archive.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Script to create Chrome Installer archive.
 
   This script is used to create an archive of all the files required for a
   Chrome install in appropriate directory structure. It reads chrome.release
   file as input, creates chrome.7z archive, compresses setup.exe and
@@ skipping 450 matching lines @@
     # setup.exe to be able to run (as it doesn't statically link in component
     # DLLs).
     # This makes the archive ~1.5X bigger (Release ~185MB => ~278MB;
     # Debug ~520MB => ~875MB) this is however simpler than any other installer
     # change and doesn't make archive generation itself slower so it only
     # matters when copying the archive to other test machines. This approach
     # can be revised if this is a problem.
     shutil.copy(component_dll, installer_dir)
     component_dll_filenames.append(os.path.basename(component_dll))
 
-  # Copy chrome.exe.manifest as-is. It is required, among other things, to
-  # declare a dependency on the version dir assembly.
-  shutil.copy(os.path.join(build_dir, 'chrome.exe.manifest'), chrome_dir)
-
-  # Also copy setup.exe.manifest as-is. It is required, among other things, to
-  # let setup.exe UAC when it wants to, by specifying that it handles elevation
-  # "asInvoker", rather than have Windows auto-elevate it when launched.
-  shutil.copy(os.path.join(build_dir, 'setup.exe.manifest'), installer_dir)
-
   # Augment {version}.manifest to include all component DLLs as part of the
   # assembly it constitutes, which will allow dependents of this assembly to
   # find these DLLs.
   version_assembly_dll_additions = []
   for dll_filename in component_dll_filenames:
     version_assembly_dll_additions.append("  <file name='%s'/>" % dll_filename)
   CopyAndAugmentManifest(build_dir, version_dir,
                          '%s.manifest' % current_version,
                          '\n'.join(version_assembly_dll_additions),
                          '</assembly>')
@@ skipping 109 matching lines @@
   if not options.resource_file_path:
     options.resource_file_path = os.path.join(options.build_dir,
                                               MINI_INSTALLER_INPUT_FILE)
 
   return options
 
 
 if '__main__' == __name__:
   print sys.argv
   sys.exit(main(_ParseOptions()))