Revert of Added behind link_core_modules_separately flag to gyp files.

Source/web/web.gyp

 #
 # Copyright (C) 2011 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #         * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #         * Redistributions in binary form must reproduce the above
@@ skipping 38 matching lines @@
         },
     },
     'targets': [
         {
             'target_name': 'blink_web',
             'type': '<(component)',
             'variables': { 'enable_wexit_time_destructors': 1, },
             'dependencies': [
                 '../config.gyp:config',
                 '../platform/blink_platform.gyp:blink_common',
+                '../core/core.gyp:webcore',
                 '../modules/modules.gyp:modules',
                 '<(DEPTH)/skia/skia.gyp:skia',
                 '<(angle_path)/src/angle.gyp:translator',
                 '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
                 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
                 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
             ],
             'export_dependent_settings': [
                 '<(DEPTH)/skia/skia.gyp:skia',
                 '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
                 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
                 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
             ],
             'include_dirs': [
                 '<(angle_path)/include',
                 '<(DEPTH)/third_party/skia/include/utils',
             ],
             'defines': [
                 'BLINK_IMPLEMENTATION=1',
                 'INSIDE_BLINK',
             ],
             'sources': [
                 '<@(web_files)',
             ],
             'conditions': [
                 ['component=="shared_library"', {
                     'dependencies': [
+                        '../core/core.gyp:webcore_generated',
+                        '../core/core.gyp:webcore_testing',
+                        '../modules/modules.gyp:modules_testing',
                         '../wtf/wtf_tests.gyp:wtf_unittest_helpers',
                         '<(DEPTH)/base/base.gyp:test_support_base',
                         '<(DEPTH)/testing/gmock.gyp:gmock',
                         '<(DEPTH)/testing/gtest.gyp:gtest',
                         '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
                         '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
                         '<(DEPTH)/third_party/libpng/libpng.gyp:libpng',
                         '<(DEPTH)/third_party/libwebp/libwebp.gyp:libwebp',
+                        '<(DEPTH)/third_party/libxml/libxml.gyp:libxml',
+                        '<(DEPTH)/third_party/libxslt/libxslt.gyp:libxslt',
                         '<(DEPTH)/third_party/modp_b64/modp_b64.gyp:modp_b64',
                         '<(DEPTH)/third_party/ots/ots.gyp:ots',
                         '<(DEPTH)/third_party/zlib/zlib.gyp:zlib',
                         '<(DEPTH)/url/url.gyp:url_lib',
                         '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
                         '<(libjpeg_gyp_path):libjpeg',
                         # We must not add webkit_support here because of cyclic dependency.
                     ],
                     'export_dependent_settings': [
                         '<(DEPTH)/url/url.gyp:url_lib',
@@ skipping 17 matching lines @@
                         '<@(platform_web_unittest_files)',
                         '<@(web_unittest_files)',
                         'WebTestingSupport.cpp',
                     ],
                     'conditions': [
                         ['use_openssl==0 and (OS=="win" or OS=="mac")', {
                             'dependencies': [
                                 '<(DEPTH)/third_party/nss/nss.gyp:*',
                             ],
                         }],
-                        ['link_core_modules_separately==1', {
-                            'dependencies': [
-                                # webcore_shared has dependencies:
-                                # webcore_generated and webcore_testing.
-                                # So no need to add webcore_testing here.
-                                '../core/core.gyp:webcore_shared',
-                                '../platform/blink_platform.gyp:blink_common',
-                                '../platform/blink_platform.gyp:blink_platform',
-                                '../wtf/wtf.gyp:wtf',
-                            ],
-                        }, {
-                            'dependencies': [
-                                 '../core/core.gyp:webcore',
-                                '../core/core.gyp:webcore_testing',
-                                '../modules/modules.gyp:modules_testing',
-                                '<(DEPTH)/third_party/libxml/libxml.gyp:libxml',
-                                '<(DEPTH)/third_party/libxslt/libxslt.gyp:libxslt',
-                             ],
-                        }]
                     ],
                     'msvs_settings': {
                       'VCLinkerTool': {
                         'conditions': [
                           ['incremental_chrome_dll==1', {
                             'UseLibraryDependencyInputs': "true",
                           }],
                         ],
                       },
                     },
-                }, {
-                     # component=="static_library"
-                     'dependencies': [
-                        # webcore has dependencies: webcore_generated and
-                        # webcore_testing.
-                        '../core/core.gyp:webcore',
-                     ],
                 }],
                 ['OS == "linux"', {
                     'dependencies': [
                         '<(DEPTH)/build/linux/system.gyp:fontconfig',
                     ],
                 }, {
                     'sources/': [
                         ['exclude', 'linux/'],
                     ],
                 }],
@@ skipping 51 matching lines @@
         {
             # GN version: //third_party/WebKit/Source/web:test_support
             'target_name': 'blink_web_test_support',
             'conditions': [
                 ['component=="shared_library"', {
                     'type': 'none',
                 }, {
                     'type': 'static_library',
                     'dependencies': [
                         '../config.gyp:config',
+                        '../core/core.gyp:webcore_generated',
                         '../core/core.gyp:webcore_testing',
                         '../modules/modules.gyp:modules_testing',
                         '../wtf/wtf.gyp:wtf',
                         '<(DEPTH)/skia/skia.gyp:skia',
                         '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
                     ],
                     'include_dirs': [
                         '../../',
                         '<(SHARED_INTERMEDIATE_DIR)/blink',  # gen/blink
                     ],
@@ skipping 20 matching lines @@
                     'dependencies': ['<(DEPTH)/third_party/mesa/mesa.gyp:osmesa'],
                     'copies': [{
                         'destination': '<(PRODUCT_DIR)/DumpRenderTree.app/Contents/MacOS/',
                         'files': ['<(PRODUCT_DIR)/osmesa.so'],
                     }],
                 },
             ],
         }],
     ], # conditions
 }