| 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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 47 ], | 47 ], |
| 48 'targets': [ | 48 'targets': [ |
| 49 { | 49 { |
| 50 'target_name': 'TestRunner', | 50 'target_name': 'TestRunner', |
| 51 'type': '<(component)', | 51 'type': '<(component)', |
| 52 'defines': [ | 52 'defines': [ |
| 53 'WEBTESTRUNNER_IMPLEMENTATION=1', | 53 'WEBTESTRUNNER_IMPLEMENTATION=1', |
| 54 ], | 54 ], |
| 55 'dependencies': [ | 55 'dependencies': [ |
| 56 'TestRunner_resources', | 56 'TestRunner_resources', |
| 57 '../config.gyp:unittest_config', |
| 57 '../../public/blink.gyp:blink', | 58 '../../public/blink.gyp:blink', |
| 58 '<(source_dir)/web/web.gyp:webkit_test_support', | 59 '<(source_dir)/web/web.gyp:webkit_test_support', |
| 59 ], | 60 ], |
| 60 'export_dependent_settings': [ | 61 'export_dependent_settings': [ |
| 61 '../../public/blink.gyp:blink', | 62 '../../public/blink.gyp:blink', |
| 62 ], | 63 ], |
| 63 'direct_dependent_settings': { | 64 'direct_dependent_settings': { |
| 64 'include_dirs': [ | 65 'include_dirs': [ |
| 65 '../..', | 66 '../..', |
| 66 ], | 67 ], |
| (...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 234 ] | 235 ] |
| 235 }], | 236 }], |
| 236 }], | 237 }], |
| 237 ], | 238 ], |
| 238 }, | 239 }, |
| 239 { | 240 { |
| 240 'target_name': 'TestNetscapePlugIn', | 241 'target_name': 'TestNetscapePlugIn', |
| 241 'type': 'loadable_module', | 242 'type': 'loadable_module', |
| 242 'sources': [ '<@(test_plugin_files)' ], | 243 'sources': [ '<@(test_plugin_files)' ], |
| 243 'dependencies': [ | 244 'dependencies': [ |
| 245 '../config.gyp:unittest_config', |
| 244 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi', | 246 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi', |
| 245 ], | 247 ], |
| 246 'include_dirs': [ | 248 'include_dirs': [ |
| 247 '<(DEPTH)', | 249 '<(DEPTH)', |
| 248 '<(source_dir)/testing/plugin/', | 250 '<(source_dir)/testing/plugin/', |
| 249 ], | 251 ], |
| 250 'conditions': [ | 252 'conditions': [ |
| 251 ['OS=="mac"', { | 253 ['OS=="mac"', { |
| 252 'mac_bundle': 1, | 254 'mac_bundle': 1, |
| 253 'product_extension': 'plugin', | 255 'product_extension': 'plugin', |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 344 'target_defaults': { | 346 'target_defaults': { |
| 345 # FIXME: Add -Wglobal-constructors after fixing existing bugs. | 347 # FIXME: Add -Wglobal-constructors after fixing existing bugs. |
| 346 'cflags': ['-Wunused-parameter'], | 348 'cflags': ['-Wunused-parameter'], |
| 347 'xcode_settings': { | 349 'xcode_settings': { |
| 348 'WARNING_CFLAGS': ['-Wunused-parameter'], | 350 'WARNING_CFLAGS': ['-Wunused-parameter'], |
| 349 }, | 351 }, |
| 350 }, | 352 }, |
| 351 }], | 353 }], |
| 352 ], # conditions | 354 ], # conditions |
| 353 } | 355 } |
| OLD | NEW |