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

chrome/chrome_installer.gypi

 # 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.
 
 {
   'variables': {
     'lastchange_path': '../build/util/LASTCHANGE',
     # 'branding_dir' is set in the 'conditions' section at the bottom.
   },
   'conditions': [
@@ skipping 68 matching lines @@
             '../base/base.gyp:test_support_base',
             '../build/temp_gyp/googleurl.gyp:googleurl',
             '../content/content.gyp:content_common',
             '../testing/gmock.gyp:gmock',
             '../testing/gtest.gyp:gtest',
           ],
           'include_dirs': [
             '..',
           ],
           'sources': [
-            'app/additional.manifest',
             'installer/setup/compat_checks_unittest.cc',
             'installer/setup/setup_constants.cc',
             'installer/util/channel_info_unittest.cc',
             'installer/util/copy_reg_key_work_item_unittest.cc',
             'installer/util/copy_tree_work_item_unittest.cc',
             'installer/util/create_dir_work_item_unittest.cc',
             'installer/util/create_reg_key_work_item_unittest.cc',
             'installer/util/delete_after_reboot_helper_unittest.cc',
             'installer/util/delete_reg_key_work_item_unittest.cc',
             'installer/util/delete_reg_value_work_item_unittest.cc',
@@ skipping 23 matching lines @@
             'installer/util/registry_test_data.h',
             'installer/util/run_all_unittests.cc',
             'installer/util/self_cleaning_temp_dir_unittest.cc',
             'installer/util/set_reg_value_work_item_unittest.cc',
             'installer/util/shell_util_unittest.cc',
             'installer/util/wmi_unittest.cc',
             'installer/util/work_item_list_unittest.cc',
           ],
           'msvs_settings': {
             'VCManifestTool': {
-              'AdditionalManifestFiles': '$(ProjectDir)\\app\\additional.manifest',
+              'AdditionalManifestFiles': '$(ProjectDir)\\installer\\mini_installer\\mini_installer.exe.manifest',
             },
           },
         },
         {
           'target_name': 'installer_util_strings',
           'type': 'none',
           'rules': [
             {
               'rule_name': 'installer_util_strings',
               'extension': 'grd',
@@ skipping 84 matching lines @@
             '../base/base.gyp:base_i18n',
             '../base/base.gyp:test_support_base',
             '../chrome/chrome.gyp:test_support_common',
             '../testing/gtest.gyp:gtest',
           ],
           'include_dirs': [
             '..',
           ],
           'sources': [
             '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/installer_util_strings.rc',
-            'app/additional.manifest',
             'installer/util/installation_validation_helper.cc',
             'installer/util/installation_validation_helper.h',
             'test/mini_installer_test/installer_path_provider.cc',
             'test/mini_installer_test/installer_path_provider.h',
             'test/mini_installer_test/installer_test_util.cc',
             'test/mini_installer_test/installer_test_util.h',
             'test/mini_installer_test/mini_installer_test_constants.cc',
             'test/mini_installer_test/mini_installer_test_constants.h',
             'test/mini_installer_test/run_all_unittests.cc',
             'test/mini_installer_test/switch_builder.cc',
             'test/mini_installer_test/switch_builder.h',
             'test/mini_installer_test/test.cc',
           ],
           'msvs_settings': {
             'VCManifestTool': {
-              'AdditionalManifestFiles': '$(ProjectDir)\\app\\additional.manifest',
+              'AdditionalManifestFiles': '$(ProjectDir)\\installer\\mini_installer\\mini_installer.exe.manifest',
             },
           },
         },
         {
           'target_name': 'setup',
           'type': 'executable',
           'dependencies': [
             'installer_util',
             'installer_util_strings',
             '../base/base.gyp:base',
             '../build/temp_gyp/googleurl.gyp:googleurl',
             '../chrome/chrome.gyp:common_constants',
             '../chrome_frame/chrome_frame.gyp:chrome_tab_idl',
             '../chrome_frame/chrome_frame.gyp:npchrome_frame',
             '../breakpad/breakpad.gyp:breakpad_handler',
             '../rlz/rlz.gyp:rlz_lib',
             '../third_party/zlib/zlib.gyp:zlib',
           ],
           'include_dirs': [
             '..',
             '<(INTERMEDIATE_DIR)',
             '<(SHARED_INTERMEDIATE_DIR)/setup',
           ],
           'direct_dependent_settings': {
             'include_dirs': [
               '<(SHARED_INTERMEDIATE_DIR)/setup',
             ],
           },
           'sources': [
-            'app/additional.manifest',
             'installer/mini_installer/chrome.release',
             'installer/setup/chrome_frame_quick_enable.cc',
             'installer/setup/chrome_frame_quick_enable.h',
             'installer/setup/chrome_frame_ready_mode.cc',
             'installer/setup/chrome_frame_ready_mode.h',
             'installer/setup/install.cc',
             'installer/setup/install.h',
             'installer/setup/install_worker.cc',
             'installer/setup/install_worker.h',
             'installer/setup/setup_main.cc',
             'installer/setup/setup.ico',
             'installer/setup/setup.rc',
             'installer/setup/setup_constants.cc',
             'installer/setup/setup_constants.h',
             'installer/setup/setup_exe_version.rc.version',
             'installer/setup/setup_resource.h',
             'installer/setup/setup_util.cc',
             'installer/setup/setup_util.h',
             'installer/setup/uninstall.cc',
             'installer/setup/uninstall.h',
           ],
           'msvs_settings': {
             'VCLinkerTool': {
               'SubSystem': '2',     # Set /SUBSYSTEM:WINDOWS
             },
             'VCManifestTool': {
-              'AdditionalManifestFiles': '$(ProjectDir)\\app\\additional.manifest',
+              'AdditionalManifestFiles': '$(ProjectDir)\\installer\\setup\\setup.exe.manifest',
             },
           },
           'rules': [
             {
               'rule_name': 'setup_version',
               'extension': 'version',
               'variables': {
                 'version_py_path': '../chrome/tools/build/version.py',
                 'template_input_path': 'installer/setup/setup_exe_version.rc.version',
               },
@@ skipping 774 matching lines @@
          'branding_dir_100': 'app/theme/default_100_percent/google_chrome',
       },
     }, { # else branding!="Chrome"
       'variables': {
          'branding_dir': 'app/theme/chromium',
          'branding_dir_100': 'app/theme/default_100_percent/chromium',
       },
     }],
   ],
 }