Revert of Added behind link_core_modules_separately flag to gyp files.

Source/modules/modules.gyp

 #
 # Copyright (C) 2013 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 11 matching lines @@
 # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 {
   'includes': [
-    '../build/features.gypi',
     '../build/scripts/scripts.gypi',
     '../build/win/precompile.gypi',
     '../bindings/modules/modules.gypi',  # modules can depend on bindings/modules, but not on bindings
     'modules.gypi',
   ],
   'targets': [{
     # GN version: //third_party/WebKit/Source/modules:modules
     'target_name': 'modules',
+    'type': 'static_library',
     'dependencies': [
       '<(DEPTH)/third_party/zlib/zlib.gyp:zlib',
       '<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite',
       '../config.gyp:config',
+      '../core/core.gyp:webcore',
       'modules_generated.gyp:make_modules_generated',
     ],
     'defines': [
       'BLINK_IMPLEMENTATION=1',
       'INSIDE_BLINK',
     ],
     'sources': [
       '<@(modules_files)',
       '<@(bindings_modules_v8_files)',
       '<@(bindings_modules_v8_generated_aggregate_files)',
       '<@(bindings_modules_v8_generated_partial_aggregate_files)',
       '<@(bindings_modules_v8_generated_union_type_files)',
       '<(bindings_modules_v8_output_dir)/initPartialInterfacesInModules.cpp',
     ],
-    'conditions': [
-      ['component=="shared_library" and link_core_modules_separately==1', {
-        'type': 'shared_library',
-        'defines': [
-          'BLINK_MODULES_IMPLEMENTATION=1',
-        ],
-        'dependencies': [
-          '../core/core.gyp:webcore_shared', # modules depends on core.
-          '../platform/blink_platform.gyp:blink_common',
-          '../platform/blink_platform.gyp:blink_platform',
-          '../wtf/wtf.gyp:wtf',
-          '<(DEPTH)/url/url.gyp:url_lib',
-          '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
-        ],
-        'sources': [
-          '<@(modules_testing_files)',
-          '<(bindings_modules_v8_output_dir)/V8InternalsPartial.cpp',
-          '<(bindings_modules_v8_output_dir)/V8InternalsPartial.h',
-        ],
-      }, {
-        'type': 'static_library',
-        'dependencies': [
-          'modules_testing',
-          '../core/core.gyp:webcore',
-        ],
-      }]
-    ],
     # Disable c4267 warnings until we fix size_t to int truncations.
     'msvs_disabled_warnings': [ 4267, 4334, ]
   },
   {
     # GN version: //third_party/WebKit/Source/modules:modules_testing
     'target_name': 'modules_testing',
     'type': 'static_library',
     'dependencies': [
       '../config.gyp:config',
       '../core/core.gyp:webcore',
     ],
     'defines': [
       'BLINK_IMPLEMENTATION=1',
       'INSIDE_BLINK',
     ],
     'sources': [
       '<@(modules_testing_files)',
       '<(bindings_modules_v8_output_dir)/V8InternalsPartial.cpp',
       '<(bindings_modules_v8_output_dir)/V8InternalsPartial.h',
     ],
 
   }],
 }