| 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 221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 232 ], | 232 ], |
| 233 'sources': [ | 233 'sources': [ |
| 234 'WebTestingSupport.cpp', | 234 'WebTestingSupport.cpp', |
| 235 ], | 235 ], |
| 236 }], | 236 }], |
| 237 ], | 237 ], |
| 238 }, | 238 }, |
| 239 { | 239 { |
| 240 'target_name': 'image_decode_bench', | 240 'target_name': 'image_decode_bench', |
| 241 'type': 'executable', | 241 'type': 'executable', |
| 242 'includes': [ |
| 243 '../platform/blink_platform.gypi', |
| 244 ], |
| 242 'dependencies': [ | 245 'dependencies': [ |
| 243 '../config.gyp:config', | 246 '../config.gyp:config', |
| 244 '../core/core.gyp:webcore', | 247 '../core/core.gyp:webcore', |
| 245 '../platform/blink_platform.gyp:blink_common', | 248 '../platform/blink_platform.gyp:blink_common', |
| 246 '../wtf/wtf.gyp:wtf', | 249 '../wtf/wtf.gyp:wtf', |
| 247 'blink_web', | 250 'blink_web', |
| 248 'blink_web_test_support', | 251 'blink_web_test_support', |
| 252 '<(DEPTH)/base/base.gyp:test_support_base', |
| 249 ], | 253 ], |
| 250 'defines': [ | 254 'defines': [ |
| 251 'BLINK_IMPLEMENTATION=1', | 255 'BLINK_IMPLEMENTATION=1', |
| 252 ], | 256 ], |
| 253 'sources': [ | 257 'sources': [ |
| 254 'ImageDecodeBench.cpp', | 258 'ImageDecodeBench.cpp', |
| 259 '<@(platform_test_support_files)', |
| 255 ], | 260 ], |
| 256 }, | 261 }, |
| 257 ], # targets | 262 ], # targets |
| 258 'conditions': [ | 263 'conditions': [ |
| 259 ['gcc_version>=46', { | 264 ['gcc_version>=46', { |
| 260 'target_defaults': { | 265 'target_defaults': { |
| 261 # Disable warnings about c++0x compatibility, as some names (suc
h | 266 # Disable warnings about c++0x compatibility, as some names (suc
h |
| 262 # as nullptr) conflict with upcoming c++0x types. | 267 # as nullptr) conflict with upcoming c++0x types. |
| 263 'cflags_cc': ['-Wno-c++0x-compat'], | 268 'cflags_cc': ['-Wno-c++0x-compat'], |
| 264 }, | 269 }, |
| 265 }], | 270 }], |
| 266 ['OS=="mac"', { | 271 ['OS=="mac"', { |
| 267 'targets': [ | 272 'targets': [ |
| 268 { | 273 { |
| 269 'target_name': 'copy_mesa', | 274 'target_name': 'copy_mesa', |
| 270 'type': 'none', | 275 'type': 'none', |
| 271 'dependencies': ['<(DEPTH)/third_party/mesa/mesa.gyp:osmesa'
], | 276 'dependencies': ['<(DEPTH)/third_party/mesa/mesa.gyp:osmesa'
], |
| 272 'copies': [{ | 277 'copies': [{ |
| 273 'destination': '<(PRODUCT_DIR)/DumpRenderTree.app/Conten
ts/MacOS/', | 278 'destination': '<(PRODUCT_DIR)/DumpRenderTree.app/Conten
ts/MacOS/', |
| 274 'files': ['<(PRODUCT_DIR)/osmesa.so'], | 279 'files': ['<(PRODUCT_DIR)/osmesa.so'], |
| 275 }], | 280 }], |
| 276 }, | 281 }, |
| 277 ], | 282 ], |
| 278 }], | 283 }], |
| 279 ], # conditions | 284 ], # conditions |
| 280 } | 285 } |
| OLD | NEW |