Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / core.gyp

diff --git a/src/third_party/WebKit/Source/core/core.gyp b/src/third_party/WebKit/Source/core/core.gyp
index 6b788eb..8968008 100644 (file)
--- a/src/third_party/WebKit/Source/core/core.gyp
+++ b/src/third_party/WebKit/Source/core/core.gyp
@@ -200,6 +200,7 @@
         # These files include all the .cpp files generated from the .idl files
         # in webcore_files.
         '<@(bindings_core_v8_generated_aggregate_files)',
+        '<@(bindings_core_v8_generated_union_type_files)',
 
         # Additional .cpp files for HashTools.h
         '<(blink_core_output_dir)/CSSPropertyNames.cpp',
@@ -238,8 +239,8 @@
         # Generated from MediaTypeNames.in
         '<(blink_core_output_dir)/MediaTypeNames.cpp',
 
-        # Generated from CSSTokenizer-in.cpp
-        '<(blink_core_output_dir)/CSSTokenizer.cpp',
+        # Generated from BisonCSSTokenizer-in.cpp
+        '<(blink_core_output_dir)/BisonCSSTokenizer.cpp',
 
         # Generated from BisonCSSParser-in.cpp
         '<(blink_core_output_dir)/BisonCSSParser.cpp',
@@ -318,7 +319,7 @@
         '../platform/blink_platform.gyp:blink_platform',
         '<(DEPTH)/gpu/gpu.gyp:gles2_c_lib',
         '<(DEPTH)/skia/skia.gyp:skia',
-        '<(angle_path)/src/build_angle.gyp:translator',
+        '<(angle_path)/src/angle.gyp:translator',
         '<(DEPTH)/third_party/iccjpeg/iccjpeg.gyp:iccjpeg',
         '<(DEPTH)/third_party/libpng/libpng.gyp:libpng',
         '<(DEPTH)/third_party/libwebp/libwebp.gyp:libwebp',
@@ -337,7 +338,7 @@
         '../config.gyp:config',
         '<(DEPTH)/gpu/gpu.gyp:gles2_c_lib',
         '<(DEPTH)/skia/skia.gyp:skia',
-        '<(angle_path)/src/build_angle.gyp:translator',
+        '<(angle_path)/src/angle.gyp:translator',
         '<(DEPTH)/third_party/iccjpeg/iccjpeg.gyp:iccjpeg',
         '<(DEPTH)/third_party/libpng/libpng.gyp:libpng',
         '<(DEPTH)/third_party/libwebp/libwebp.gyp:libwebp',
@@ -620,9 +621,9 @@
         ['exclude', '(?<!Chromium)(CF|CG|Mac|Win)\\.(cpp|mm?)$'],
       ],
       'conditions': [
-        # Shard this taret into parts to work around linker limitations.
+        # Shard this target into parts to work around linker limitations.
         # on link time code generation builds.
-        ['OS=="win" and buildtype=="Official"', {
+        ['OS=="win" and (buildtype=="Official" or (fastbuild==0 and win_z7==1))', {
           'msvs_shard': 19,
         }],
         ['OS != "linux"', {
@@ -766,6 +767,8 @@
         '<(bindings_core_v8_output_dir)/V8PrivateScriptTest.h',
         '<(bindings_core_v8_output_dir)/V8TypeConversions.cpp',
         '<(bindings_core_v8_output_dir)/V8TypeConversions.h',
+        '<(bindings_core_v8_output_dir)/V8UnionTypesTest.cpp',
+        '<(bindings_core_v8_output_dir)/V8UnionTypesTest.h',
         '<(bindings_core_v8_output_dir)/V8Internals.cpp',
         '<(bindings_core_v8_output_dir)/V8Internals.h',
         '<(bindings_core_v8_output_dir)/V8InternalProfilers.cpp',