Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # | 1 # |
| 2 # Copyright (C) 2011 Google Inc. All rights reserved. | 2 # Copyright (C) 2011 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 18 matching lines...) Expand all Loading... | |
| 29 # | 29 # |
| 30 | 30 |
| 31 { | 31 { |
| 32 'includes': [ | 32 'includes': [ |
| 33 '../bindings/bindings.gypi', | 33 '../bindings/bindings.gypi', |
| 34 '../core/core.gypi', | 34 '../core/core.gypi', |
| 35 '../build/features.gypi', | 35 '../build/features.gypi', |
| 36 '../build/scripts/scripts.gypi', | 36 '../build/scripts/scripts.gypi', |
| 37 '../build/win/precompile.gypi', | 37 '../build/win/precompile.gypi', |
| 38 '../modules/modules.gypi', | 38 '../modules/modules.gypi', |
| 39 '../platform/blink_platform.gypi', | |
| 39 '../wtf/wtf.gypi', | 40 '../wtf/wtf.gypi', |
| 40 'web.gypi', | 41 'web.gypi', |
| 41 ], | 42 ], |
| 42 'targets': [ | 43 'targets': [ |
| 43 { | 44 { |
| 44 'target_name': 'webkit', | 45 'target_name': 'webkit', |
| 45 'type': '<(component)', | 46 'type': '<(component)', |
| 46 'variables': { 'enable_wexit_time_destructors': 1, }, | 47 'variables': { 'enable_wexit_time_destructors': 1, }, |
| 47 'dependencies': [ | 48 'dependencies': [ |
| 48 '../config.gyp:config', | 49 '../config.gyp:config', |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 109 '../core/testing/v8', # for WebCoreTestSupport.h, needed to link in window.internals code. | 110 '../core/testing/v8', # for WebCoreTestSupport.h, needed to link in window.internals code. |
| 110 ], | 111 ], |
| 111 'sources': [ | 112 'sources': [ |
| 112 # Compile Blink unittest files into webkit.dll in compon ent build mode | 113 # Compile Blink unittest files into webkit.dll in compon ent build mode |
| 113 # since there're methods that are tested but not exporte d. | 114 # since there're methods that are tested but not exporte d. |
| 114 # WebUnitTests.* exports an API that runs all the unitte sts inside | 115 # WebUnitTests.* exports an API that runs all the unitte sts inside |
| 115 # webkit.dll. | 116 # webkit.dll. |
| 116 '<@(bindings_unittest_files)', | 117 '<@(bindings_unittest_files)', |
| 117 '<@(core_unittest_files)', | 118 '<@(core_unittest_files)', |
| 118 '<@(modules_unittest_files)', | 119 '<@(modules_unittest_files)', |
| 120 '<@(platform_web_unittest_files)', | |
|
abarth-chromium
2014/01/07 17:35:22
Can you add a FIXME about wanting to remove this l
| |
| 119 '<@(web_unittest_files)', | 121 '<@(web_unittest_files)', |
| 120 'WebTestingSupport.cpp', | 122 'WebTestingSupport.cpp', |
| 121 'tests/WebUnitTests.cpp', # Components test runner sup port. | 123 'tests/WebUnitTests.cpp', # Components test runner sup port. |
| 122 ], | 124 ], |
| 123 'conditions': [ | 125 'conditions': [ |
| 124 ['OS=="win" or OS=="mac"', { | 126 ['OS=="win" or OS=="mac"', { |
| 125 'dependencies': [ | 127 'dependencies': [ |
| 126 '<(DEPTH)/third_party/nss/nss.gyp:*', | 128 '<(DEPTH)/third_party/nss/nss.gyp:*', |
| 127 ], | 129 ], |
| 128 }], | 130 }], |
| (...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 371 ['clang==1', { | 373 ['clang==1', { |
| 372 'target_defaults': { | 374 'target_defaults': { |
| 373 'cflags': ['-Wglobal-constructors'], | 375 'cflags': ['-Wglobal-constructors'], |
| 374 'xcode_settings': { | 376 'xcode_settings': { |
| 375 'WARNING_CFLAGS': ['-Wglobal-constructors'], | 377 'WARNING_CFLAGS': ['-Wglobal-constructors'], |
| 376 }, | 378 }, |
| 377 }, | 379 }, |
| 378 }], | 380 }], |
| 379 ], # conditions | 381 ], # conditions |
| 380 } | 382 } |
| OLD | NEW |