| OLD | NEW | 
|---|
| 1 # | 1 # | 
| 2 # Copyright (C) 2013 Google Inc. All rights reserved. | 2 # Copyright (C) 2013 Google Inc. All rights reserved. | 
| 3 # | 3 # | 
| 4 # Redistribution and use in source and binary forms, with or without | 4 # Redistribution and use in source and binary forms, with or without | 
| 5 # modification, are permitted provided that the following conditions are | 5 # modification, are permitted provided that the following conditions are | 
| 6 # met: | 6 # met: | 
| 7 # | 7 # | 
| 8 #     * Redistributions of source code must retain the above copyright | 8 #     * Redistributions of source code must retain the above copyright | 
| 9 # notice, this list of conditions and the following disclaimer. | 9 # notice, this list of conditions and the following disclaimer. | 
| 10 #     * Redistributions in binary form must reproduce the above | 10 #     * Redistributions in binary form must reproduce the above | 
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 50         '..', | 50         '..', | 
| 51       ], | 51       ], | 
| 52     }, | 52     }, | 
| 53     'export_dependent_settings': [ | 53     'export_dependent_settings': [ | 
| 54       '<(DEPTH)/skia/skia.gyp:skia', | 54       '<(DEPTH)/skia/skia.gyp:skia', | 
| 55     ], | 55     ], | 
| 56     'defines': [ | 56     'defines': [ | 
| 57       'BLINK_COMMON_IMPLEMENTATION=1', | 57       'BLINK_COMMON_IMPLEMENTATION=1', | 
| 58       'INSIDE_BLINK', | 58       'INSIDE_BLINK', | 
| 59     ], | 59     ], | 
|  | 60     'include_dirs': [ | 
|  | 61       # FIXME: Remove these once scripts generate qualified | 
|  | 62       # includes correctly: http://crbug.com/380054 | 
|  | 63       '<(blink_platform_output_dir)', | 
|  | 64     ], | 
| 60     'sources': [ | 65     'sources': [ | 
| 61       'exported/WebCString.cpp', | 66       'exported/WebCString.cpp', | 
| 62       'exported/WebString.cpp', | 67       'exported/WebString.cpp', | 
| 63       'exported/WebCommon.cpp', | 68       'exported/WebCommon.cpp', | 
| 64     ], | 69     ], | 
| 65   }, | 70   }, | 
| 66   { | 71   { | 
| 67     'target_name': 'blink_heap_asm_stubs', | 72     'target_name': 'blink_heap_asm_stubs', | 
| 68     'type': 'static_library', | 73     'type': 'static_library', | 
| 69     # VS2010 does not correctly incrementally link obj files generated | 74     # VS2010 does not correctly incrementally link obj files generated | 
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 205       '<(DEPTH)/url/url.gyp:url_lib', | 210       '<(DEPTH)/url/url.gyp:url_lib', | 
| 206       '<(DEPTH)/third_party/iccjpeg/iccjpeg.gyp:iccjpeg', | 211       '<(DEPTH)/third_party/iccjpeg/iccjpeg.gyp:iccjpeg', | 
| 207       '<(libjpeg_gyp_path):libjpeg', | 212       '<(libjpeg_gyp_path):libjpeg', | 
| 208     ], | 213     ], | 
| 209     'defines': [ | 214     'defines': [ | 
| 210       'BLINK_PLATFORM_IMPLEMENTATION=1', | 215       'BLINK_PLATFORM_IMPLEMENTATION=1', | 
| 211       'INSIDE_BLINK', | 216       'INSIDE_BLINK', | 
| 212     ], | 217     ], | 
| 213     'include_dirs': [ | 218     'include_dirs': [ | 
| 214       '<(angle_path)/include', | 219       '<(angle_path)/include', | 
| 215       '<(SHARED_INTERMEDIATE_DIR)/blink', | 220       '<(blink_platform_output_dir)', | 
| 216     ], | 221     ], | 
| 217     'xcode_settings': { | 222     'xcode_settings': { | 
| 218       # Some Mac-specific parts of WebKit won't compile without having this | 223       # Some Mac-specific parts of WebKit won't compile without having this | 
| 219       # prefix header injected. | 224       # prefix header injected. | 
| 220       # FIXME: make this a first-class setting. | 225       # FIXME: make this a first-class setting. | 
| 221       'GCC_PREFIX_HEADER': '../core/WebCorePrefixMac.h', | 226       'GCC_PREFIX_HEADER': '../core/WebCorePrefixMac.h', | 
| 222     }, | 227     }, | 
| 223     'sources': [ | 228     'sources': [ | 
| 224       '<@(platform_files)', | 229       '<@(platform_files)', | 
| 225       '<@(platform_heap_files)', | 230       '<@(platform_heap_files)', | 
| 226 | 231 | 
| 227       # Additional .cpp files from platform_generated.gyp:make_platform_generate
     d actions. | 232       # Additional .cpp files from platform_generated.gyp:make_platform_generate
     d actions. | 
| 228       '<(SHARED_INTERMEDIATE_DIR)/blink/FontFamilyNames.cpp', | 233       '<(blink_platform_output_dir)/FontFamilyNames.cpp', | 
| 229       '<(SHARED_INTERMEDIATE_DIR)/blink/RuntimeEnabledFeatures.cpp', | 234       '<(blink_platform_output_dir)/RuntimeEnabledFeatures.cpp', | 
| 230       '<(SHARED_INTERMEDIATE_DIR)/blink/RuntimeEnabledFeatures.h', | 235       '<(blink_platform_output_dir)/RuntimeEnabledFeatures.h', | 
| 231       '<(SHARED_INTERMEDIATE_DIR)/blink/ColorData.cpp', | 236       '<(blink_platform_output_dir)/ColorData.cpp', | 
| 232     ], | 237     ], | 
| 233     'sources/': [ | 238     'sources/': [ | 
| 234       # Exclude all platform specific things, reinclude them below on a per-plat
     form basis | 239       # Exclude all platform specific things, reinclude them below on a per-plat
     form basis | 
| 235       # FIXME: Figure out how to store these patterns in a variable. | 240       # FIXME: Figure out how to store these patterns in a variable. | 
| 236       ['exclude', '(cf|cg|harfbuzz|mac|opentype|win)/'], | 241       ['exclude', '(cf|cg|harfbuzz|mac|opentype|win)/'], | 
| 237       ['exclude', '(?<!Chromium)(CF|CG|Mac|Win)\\.(cpp|mm?)$'], | 242       ['exclude', '(?<!Chromium)(CF|CG|Mac|Win)\\.(cpp|mm?)$'], | 
| 238 | 243 | 
| 239       # *NEON.cpp files need special compile options. | 244       # *NEON.cpp files need special compile options. | 
| 240       # They are moved to the webcore_0_neon target. | 245       # They are moved to the webcore_0_neon target. | 
| 241       ['exclude', 'graphics/cpu/arm/.*NEON\\.(cpp|h)'], | 246       ['exclude', 'graphics/cpu/arm/.*NEON\\.(cpp|h)'], | 
| (...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 477           ['OS=="android"', { | 482           ['OS=="android"', { | 
| 478             'cflags!': ['-mthumb'], | 483             'cflags!': ['-mthumb'], | 
| 479           }], | 484           }], | 
| 480         ], | 485         ], | 
| 481       },{  # target_arch!="arm" | 486       },{  # target_arch!="arm" | 
| 482         'type': 'none', | 487         'type': 'none', | 
| 483       }], | 488       }], | 
| 484     ], | 489     ], | 
| 485   }], | 490   }], | 
| 486 } | 491 } | 
| OLD | NEW | 
|---|