| 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 23 matching lines...) Expand all Loading... |
| 34 'source_dir': '../../Source', | 34 'source_dir': '../../Source', |
| 35 'conditions': [ | 35 'conditions': [ |
| 36 ['OS=="linux"', { | 36 ['OS=="linux"', { |
| 37 'use_custom_freetype%': 1, | 37 'use_custom_freetype%': 1, |
| 38 }, { | 38 }, { |
| 39 'use_custom_freetype%': 0, | 39 'use_custom_freetype%': 0, |
| 40 }], | 40 }], |
| 41 ], | 41 ], |
| 42 }, | 42 }, |
| 43 'includes': [ | 43 'includes': [ |
| 44 '../../Source/build/defines_from_chromium.gypi', |
| 44 '../../Source/build/features.gypi', | 45 '../../Source/build/features.gypi', |
| 45 '../../Source/testing/runner/runner.gypi', | 46 '../../Source/testing/runner/runner.gypi', |
| 46 '../../Source/testing/plugin/plugin.gypi', | 47 '../../Source/testing/plugin/plugin.gypi', |
| 47 ], | 48 ], |
| 48 'targets': [ | 49 'targets': [ |
| 49 { | 50 { |
| 50 'target_name': 'TestRunner', | 51 'target_name': 'TestRunner', |
| 51 'type': '<(component)', | 52 'type': '<(component)', |
| 52 'defines': [ | 53 'defines': [ |
| 53 'WEBTESTRUNNER_IMPLEMENTATION=1', | 54 'WEBTESTRUNNER_IMPLEMENTATION=1', |
| (...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 302 'cflags_cc': ['-Wno-c++0x-compat'], | 303 'cflags_cc': ['-Wno-c++0x-compat'], |
| 303 }, | 304 }, |
| 304 }], | 305 }], |
| 305 ['clang==1', { | 306 ['clang==1', { |
| 306 'target_defaults': { | 307 'target_defaults': { |
| 307 # FIXME: Add -Wglobal-constructors after fixing existing bugs. | 308 # FIXME: Add -Wglobal-constructors after fixing existing bugs. |
| 308 }, | 309 }, |
| 309 }], | 310 }], |
| 310 ], # conditions | 311 ], # conditions |
| 311 } | 312 } |
| OLD | NEW |