Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / chrome_installer_util.gypi

diff --git a/src/chrome/chrome_installer_util.gypi b/src/chrome/chrome_installer_util.gypi
index 1777308..ef981c1 100644 (file)
--- a/src/chrome/chrome_installer_util.gypi
+++ b/src/chrome/chrome_installer_util.gypi
@@ -11,10 +11,13 @@
       # This part is shared between the two versions of the target.
       ['installer_util_target==1', {
         'sources': [
+          'installer/util/advanced_firewall_manager_win.cc',
+          'installer/util/advanced_firewall_manager_win.h',
           'installer/util/app_command.cc',
           'installer/util/app_command.h',
           'installer/util/app_commands.cc',
           'installer/util/app_commands.h',
+          'installer/util/app_registration_data.h',
           'installer/util/auto_launch_util.cc',
           'installer/util/auto_launch_util.h',
           'installer/util/browser_distribution.cc',
@@ -31,8 +34,6 @@
           'installer/util/chromium_binaries_distribution.h',
           'installer/util/conditional_work_item_list.cc',
           'installer/util/conditional_work_item_list.h',
-          'installer/util/copy_reg_key_work_item.cc',
-          'installer/util/copy_reg_key_work_item.h',
           'installer/util/copy_tree_work_item.cc',
           'installer/util/copy_tree_work_item.h',
           'installer/util/create_dir_work_item.cc',
@@ -47,6 +48,8 @@
           'installer/util/delete_tree_work_item.h',
           'installer/util/duplicate_tree_detector.cc',
           'installer/util/duplicate_tree_detector.h',
+          'installer/util/firewall_manager_win.cc',
+          'installer/util/firewall_manager_win.h',
           'installer/util/google_chrome_binaries_distribution.cc',
           'installer/util/google_chrome_binaries_distribution.h',
           'installer/util/google_chrome_sxs_distribution.cc',
@@ -71,16 +74,22 @@
           'installer/util/l10n_string_util.h',
           'installer/util/language_selector.cc',
           'installer/util/language_selector.h',
+          'installer/util/legacy_firewall_manager_win.cc',
+          'installer/util/legacy_firewall_manager_win.h',
           'installer/util/master_preferences_constants.cc',
           'installer/util/master_preferences_constants.h',
           'installer/util/move_tree_work_item.cc',
           'installer/util/move_tree_work_item.h',
+          'installer/util/non_updating_app_registration_data.h',
+          'installer/util/non_updating_app_registration_data.cc',
           'installer/util/registry_key_backup.cc',
           'installer/util/registry_key_backup.h',
           'installer/util/self_reg_work_item.cc',
           'installer/util/self_reg_work_item.h',
           'installer/util/set_reg_value_work_item.cc',
           'installer/util/set_reg_value_work_item.h',
+          'installer/util/updating_app_registration_data.h',
+          'installer/util/updating_app_registration_data.cc',
           'installer/util/util_constants.cc',
           'installer/util/util_constants.h',
           'installer/util/wmi.cc',
@@ -112,7 +121,7 @@
             '<(DEPTH)/chrome/chrome_resources.gyp:chrome_resources',
             '<(DEPTH)/chrome/chrome_resources.gyp:chrome_strings',
             '<(DEPTH)/chrome/common_constants.gyp:common_constants',
-            '<(DEPTH)/content/content.gyp:content_common',
+            '<(DEPTH)/components/components.gyp:metrics',
             '<(DEPTH)/courgette/courgette.gyp:courgette_lib',
             '<(DEPTH)/crypto/crypto.gyp:crypto',
             '<(DEPTH)/third_party/bspatch/bspatch.gyp:bspatch',
@@ -161,14 +170,6 @@
             'installer/util/user_experiment.cc',
             'installer/util/user_experiment.h',
           ],
-          'conditions': [
-            ['component=="shared_library"', {
-              'sources': [ '../content/public/common/content_switches.cc' ],
-              'defines': [ 'COMPILE_CONTENT_STATICALLY'],
-            }, {
-              'dependencies': ['<(DEPTH)/content/content.gyp:content_common'],
-            }],
-          ],
           # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
           'msvs_disabled_warnings': [ 4267, ],
         },
@@ -189,6 +190,10 @@
             '<(SHARED_INTERMEDIATE_DIR)',
           ],
           'sources': [
+            # Include |client_info.cc| directly here to avoid having to create a
+            # metrics_win64 target solely for this purpose.
+            '../components/metrics/client_info.cc',
+            '../components/metrics/client_info.h',
             'installer/util/google_chrome_distribution_dummy.cc',
             'installer/util/master_preferences.h',
             'installer/util/master_preferences_dummy.cc',
@@ -210,7 +215,6 @@
             '<(DEPTH)/base/base.gyp:base',
             '<(DEPTH)/chrome/chrome_resources.gyp:chrome_resources',
             '<(DEPTH)/chrome/chrome_resources.gyp:chrome_strings',
-            '<(DEPTH)/chrome/common_constants.gyp:common_constants',
           ],
           'sources': [
             'installer/util/google_update_experiment_util.cc',
@@ -223,12 +227,6 @@
           'include_dirs': [
             '<(DEPTH)',
           ],
-          'conditions': [
-            ['component == "shared_library"', {
-              'sources': [ '../content/public/common/content_switches.cc' ],
-              'defines': [ 'COMPILE_CONTENT_STATICALLY'],
-            }],
-          ],
         }
       ],
     }],