| OLD | NEW |
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 { | 4 { |
| 5 'variables' : { | 5 'variables' : { |
| 6 'chromedriver_unittest_sources': [ | 6 'chromedriver_unittest_sources': [ |
| 7 'test/chromedriver/capabilities_unittest.cc', | 7 'test/chromedriver/capabilities_unittest.cc', |
| 8 'test/chromedriver/chrome/chrome_finder_unittest.cc', | 8 'test/chromedriver/chrome/chrome_finder_unittest.cc', |
| 9 'test/chromedriver/chrome/console_logger_unittest.cc', | 9 'test/chromedriver/chrome/console_logger_unittest.cc', |
| 10 'test/chromedriver/chrome/device_manager_unittest.cc', | 10 'test/chromedriver/chrome/device_manager_unittest.cc', |
| (...skipping 1867 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1878 'dependencies': [ | 1878 'dependencies': [ |
| 1879 '../build/linux/system.gyp:gtk', | 1879 '../build/linux/system.gyp:gtk', |
| 1880 ], | 1880 ], |
| 1881 }], | 1881 }], |
| 1882 ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)'
, { | 1882 ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)'
, { |
| 1883 'dependencies': [ | 1883 'dependencies': [ |
| 1884 '../build/linux/system.gyp:ssl', | 1884 '../build/linux/system.gyp:ssl', |
| 1885 ], | 1885 ], |
| 1886 }], | 1886 }], |
| 1887 ['OS=="mac"', { | 1887 ['OS=="mac"', { |
| 1888 'include_dirs': [ | |
| 1889 '../third_party/GTM', | |
| 1890 ], | |
| 1891 # TODO(mark): We really want this for all non-static library | 1888 # TODO(mark): We really want this for all non-static library |
| 1892 # targets, but when we tried to pull it up to the common.gypi | 1889 # targets, but when we tried to pull it up to the common.gypi |
| 1893 # level, it broke other things like the ui and startup tests. *shrug* | 1890 # level, it broke other things like the ui and startup tests. *shrug* |
| 1894 'xcode_settings': { | 1891 'xcode_settings': { |
| 1895 'OTHER_LDFLAGS': [ | 1892 'OTHER_LDFLAGS': [ |
| 1896 '-Wl,-ObjC', | 1893 '-Wl,-ObjC', |
| 1897 ], | 1894 ], |
| 1898 }, | 1895 }, |
| 1899 # Other platforms only need | 1896 # Other platforms only need |
| 1900 # chrome_resources.gyp:{packed_extra_resources,packed_resources}, | 1897 # chrome_resources.gyp:{packed_extra_resources,packed_resources}, |
| (...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2172 'dependencies': [ | 2169 'dependencies': [ |
| 2173 '../build/linux/system.gyp:gtk', | 2170 '../build/linux/system.gyp:gtk', |
| 2174 ], | 2171 ], |
| 2175 }], | 2172 }], |
| 2176 ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)'
, { | 2173 ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)'
, { |
| 2177 'dependencies': [ | 2174 'dependencies': [ |
| 2178 '../build/linux/system.gyp:ssl', | 2175 '../build/linux/system.gyp:ssl', |
| 2179 ], | 2176 ], |
| 2180 }], | 2177 }], |
| 2181 ['OS=="mac"', { | 2178 ['OS=="mac"', { |
| 2182 'include_dirs': [ | |
| 2183 '../third_party/GTM', | |
| 2184 ], | |
| 2185 # TODO(mark): We really want this for all non-static library | 2179 # TODO(mark): We really want this for all non-static library |
| 2186 # targets, but when we tried to pull it up to the common.gypi | 2180 # targets, but when we tried to pull it up to the common.gypi |
| 2187 # level, it broke other things like the ui and startup tests. *shrug* | 2181 # level, it broke other things like the ui and startup tests. *shrug* |
| 2188 'xcode_settings': { | 2182 'xcode_settings': { |
| 2189 'OTHER_LDFLAGS': [ | 2183 'OTHER_LDFLAGS': [ |
| 2190 '-Wl,-ObjC', | 2184 '-Wl,-ObjC', |
| 2191 ], | 2185 ], |
| 2192 }, | 2186 }, |
| 2193 # Other platforms only need | 2187 # Other platforms only need |
| 2194 # chrome_resources.gyp:{packed_extra_resources,packed_resources}, | 2188 # chrome_resources.gyp:{packed_extra_resources,packed_resources}, |
| (...skipping 871 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3066 'utility', | 3060 'utility', |
| 3067 ], | 3061 ], |
| 3068 'sources': [ | 3062 'sources': [ |
| 3069 'tools/service_discovery_sniffer/service_discovery_sniffer.h', | 3063 'tools/service_discovery_sniffer/service_discovery_sniffer.h', |
| 3070 'tools/service_discovery_sniffer/service_discovery_sniffer.cc', | 3064 'tools/service_discovery_sniffer/service_discovery_sniffer.cc', |
| 3071 ], | 3065 ], |
| 3072 }] | 3066 }] |
| 3073 }], | 3067 }], |
| 3074 ], # 'conditions' | 3068 ], # 'conditions' |
| 3075 } | 3069 } |
| OLD | NEW |