| 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 24 matching lines...) Expand all Loading... |
| 35 'blink_platform.gypi', | 35 'blink_platform.gypi', |
| 36 'heap/blink_heap.gypi', | 36 'heap/blink_heap.gypi', |
| 37 ], | 37 ], |
| 38 'targets': [{ | 38 'targets': [{ |
| 39 'target_name': 'blink_common', | 39 'target_name': 'blink_common', |
| 40 'type': '<(component)', | 40 'type': '<(component)', |
| 41 'variables': { 'enable_wexit_time_destructors': 1 }, | 41 'variables': { 'enable_wexit_time_destructors': 1 }, |
| 42 'dependencies': [ | 42 'dependencies': [ |
| 43 '../config.gyp:config', | 43 '../config.gyp:config', |
| 44 '../wtf/wtf.gyp:wtf', | 44 '../wtf/wtf.gyp:wtf', |
| 45 '<(DEPTH)/base/base.gyp:base', |
| 45 # FIXME: Can we remove the dependency on Skia? | 46 # FIXME: Can we remove the dependency on Skia? |
| 46 '<(DEPTH)/skia/skia.gyp:skia', | 47 '<(DEPTH)/skia/skia.gyp:skia', |
| 48 '<(DEPTH)/url/url.gyp:url_lib', |
| 47 ], | 49 ], |
| 48 'all_dependent_settings': { | 50 'all_dependent_settings': { |
| 49 'include_dirs': [ | 51 'include_dirs': [ |
| 50 '..', | 52 '..', |
| 51 ], | 53 ], |
| 52 }, | 54 }, |
| 53 'export_dependent_settings': [ | 55 'export_dependent_settings': [ |
| 54 '<(DEPTH)/skia/skia.gyp:skia', | 56 '<(DEPTH)/skia/skia.gyp:skia', |
| 55 ], | 57 ], |
| 56 'defines': [ | 58 'defines': [ |
| 57 'BLINK_COMMON_IMPLEMENTATION=1', | 59 'BLINK_COMMON_IMPLEMENTATION=1', |
| 58 'INSIDE_BLINK', | 60 'INSIDE_BLINK', |
| 59 ], | 61 ], |
| 60 'include_dirs': [ | 62 'include_dirs': [ |
| 61 '<(SHARED_INTERMEDIATE_DIR)/blink', | 63 '<(SHARED_INTERMEDIATE_DIR)/blink', |
| 62 ], | 64 ], |
| 63 'sources': [ | 65 'sources': [ |
| 66 'exported/URLConversion.cpp', |
| 64 'exported/WebCString.cpp', | 67 'exported/WebCString.cpp', |
| 68 'exported/WebCommon.cpp', |
| 65 'exported/WebString.cpp', | 69 'exported/WebString.cpp', |
| 66 'exported/WebCommon.cpp', | |
| 67 ], | 70 ], |
| 68 }, | 71 }, |
| 69 { | 72 { |
| 70 'target_name': 'blink_heap_asm_stubs', | 73 'target_name': 'blink_heap_asm_stubs', |
| 71 'type': 'static_library', | 74 'type': 'static_library', |
| 72 # VS2010 does not correctly incrementally link obj files generated | 75 # VS2010 does not correctly incrementally link obj files generated |
| 73 # from asm files. This flag disables UseLibraryDependencyInputs to | 76 # from asm files. This flag disables UseLibraryDependencyInputs to |
| 74 # avoid this problem. | 77 # avoid this problem. |
| 75 'msvs_2010_disable_uldi_when_referenced': 1, | 78 'msvs_2010_disable_uldi_when_referenced': 1, |
| 76 'includes': [ | 79 'includes': [ |
| (...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 408 ['OS=="android"', { | 411 ['OS=="android"', { |
| 409 'cflags!': ['-mthumb'], | 412 'cflags!': ['-mthumb'], |
| 410 }], | 413 }], |
| 411 ], | 414 ], |
| 412 },{ # target_arch!="arm" | 415 },{ # target_arch!="arm" |
| 413 'type': 'none', | 416 'type': 'none', |
| 414 }], | 417 }], |
| 415 ], | 418 ], |
| 416 }], | 419 }], |
| 417 } | 420 } |
| OLD | NEW |