Revert 153268 - Refactor manifests to allow all executables to use the same base manifests as Addit…

chrome/installer/mini_installer.gyp

 {
   'variables': {
     'version_py': '../../chrome/tools/build/version.py',
     'version_path': '../../chrome/VERSION',
     'lastchange_path': '<(DEPTH)/build/util/LASTCHANGE',
     # 'branding_dir' is set in the 'conditions' section at the bottom.
     'msvs_use_common_release': 0,
     'msvs_use_common_linker_extras': 0,
     'mini_installer_internal_deps%': 0,
     'mini_installer_official_deps%': 0,
@@ skipping 61 matching lines @@
             ],
             'conditions': [
               ['MSVS_VERSION=="2005e"', {
                 'AdditionalDependencies': [ # Must explicitly link in VC2005E
                   'advapi32.lib',
                   'shell32.lib',
                 ],
               }],
             ],
           },
+          'VCManifestTool': {
+            'AdditionalManifestFiles': [
+              '$(ProjectDir)\\mini_installer\\mini_installer.exe.manifest',
+            ],
+          },
         },
         'configurations': {
           'Debug_Base': {
             'msvs_settings': {
               'VCCLCompilerTool': {
                 'BasicRuntimeChecks': '0',
                 'BufferSecurityCheck': 'false',
                 'ExceptionHandling': '0',
               },
               'VCLinkerTool': {
@@ skipping 81 matching lines @@
         {
           'target_name': 'mini_installer',
           'type': 'executable',
 
           # Disable precompiled headers for this project, to avoid
           # linker errors when building with VS 2008.
           'msvs_precompiled_header': '',
           'msvs_precompiled_source': '',
 
           'sources': [
-            '../app/additional.manifest',
             'mini_installer/chrome.release',
             'mini_installer/chrome_appid.cc',
           ],
-          'msvs_settings': {
-            'VCManifestTool': {
-              'AdditionalManifestFiles': [
-                '$(ProjectDir)\\..\\app\\additional.manifest',
-              ],
-            },
-          },
           'rules': [
             {
               'rule_name': 'installer_archive',
               'extension': 'release',
               'variables': {
                 'create_installer_archive_py_path':
                   '../tools/build/win/create_installer_archive.py',
               },
               'conditions': [
                 ['enable_hidpi == 1', {
@@ skipping 90 matching lines @@
       'variables': {
          'branding_dir': '../app/theme/google_chrome',
       },
     }, { # else branding!="Chrome"
       'variables': {
          'branding_dir': '../app/theme/chromium',
       },
     }],
   ],
 }