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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
56 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_support', | 56 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_support', |
57 ], | 57 ], |
58 'sources': [ | 58 'sources': [ |
59 'tests/RunAllTests.cpp', | 59 'tests/RunAllTests.cpp', |
60 ], | 60 ], |
61 'include_dirs': [ | 61 'include_dirs': [ |
62 'public', | 62 'public', |
63 'src', | 63 'src', |
64 ], | 64 ], |
65 'conditions': [ | 65 'conditions': [ |
66 ['component=="shared_library"', { | 66 ['component!="shared_library"', { |
67 'defines': [ | |
68 'WEBKIT_DLL_UNITTEST', | |
darin (slow to review)
2013/06/19 21:05:47
I think this change nuked webkit_unit_tests in the
jamesr
2013/06/19 21:06:52
Yikes, that's right! Why did you remove this, Joc
jochen (gone - plz use gerrit)
2013/06/20 10:49:12
OMG, that was a careless mistake :-/
Sorry about
| |
69 ], | |
70 }, { | |
71 'dependencies': [ | 67 'dependencies': [ |
72 '../../core/core.gyp:webcore', | 68 '../../core/core.gyp:webcore', |
73 ], | 69 ], |
74 'defines': [ | 70 'defines': [ |
75 'WEBKIT_IMPLEMENTATION=1', | 71 'WEBKIT_IMPLEMENTATION=1', |
76 'INSIDE_WEBKIT', | 72 'INSIDE_WEBKIT', |
77 ], | 73 ], |
78 'sources': [ | 74 'sources': [ |
79 '<@(core_unittest_files)', | 75 '<@(core_unittest_files)', |
80 '<@(modules_unittest_files)', | 76 '<@(modules_unittest_files)', |
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
151 ['clang==1', { | 147 ['clang==1', { |
152 'target_defaults': { | 148 'target_defaults': { |
153 'cflags': ['-Wunused-parameter'], | 149 'cflags': ['-Wunused-parameter'], |
154 'xcode_settings': { | 150 'xcode_settings': { |
155 'WARNING_CFLAGS': ['-Wunused-parameter'], | 151 'WARNING_CFLAGS': ['-Wunused-parameter'], |
156 }, | 152 }, |
157 }, | 153 }, |
158 }], | 154 }], |
159 ], | 155 ], |
160 } | 156 } |
OLD | NEW |