| 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 1865 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1876 'dependencies': [ | 1876 'dependencies': [ |
| 1877 '../build/linux/system.gyp:gtk', | 1877 '../build/linux/system.gyp:gtk', |
| 1878 ], | 1878 ], |
| 1879 }], | 1879 }], |
| 1880 ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)'
, { | 1880 ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)'
, { |
| 1881 'dependencies': [ | 1881 'dependencies': [ |
| 1882 '../build/linux/system.gyp:ssl', | 1882 '../build/linux/system.gyp:ssl', |
| 1883 ], | 1883 ], |
| 1884 }], | 1884 }], |
| 1885 ['OS=="mac"', { | 1885 ['OS=="mac"', { |
| 1886 'include_dirs': [ | |
| 1887 '../third_party/GTM', | |
| 1888 ], | |
| 1889 # TODO(mark): We really want this for all non-static library | 1886 # TODO(mark): We really want this for all non-static library |
| 1890 # targets, but when we tried to pull it up to the common.gypi | 1887 # targets, but when we tried to pull it up to the common.gypi |
| 1891 # level, it broke other things like the ui and startup tests. *shrug* | 1888 # level, it broke other things like the ui and startup tests. *shrug* |
| 1892 'xcode_settings': { | 1889 'xcode_settings': { |
| 1893 'OTHER_LDFLAGS': [ | 1890 'OTHER_LDFLAGS': [ |
| 1894 '-Wl,-ObjC', | 1891 '-Wl,-ObjC', |
| 1895 ], | 1892 ], |
| 1896 }, | 1893 }, |
| 1897 # Other platforms only need | 1894 # Other platforms only need |
| 1898 # chrome_resources.gyp:{packed_extra_resources,packed_resources}, | 1895 # chrome_resources.gyp:{packed_extra_resources,packed_resources}, |
| (...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2170 'dependencies': [ | 2167 'dependencies': [ |
| 2171 '../build/linux/system.gyp:gtk', | 2168 '../build/linux/system.gyp:gtk', |
| 2172 ], | 2169 ], |
| 2173 }], | 2170 }], |
| 2174 ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)'
, { | 2171 ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)'
, { |
| 2175 'dependencies': [ | 2172 'dependencies': [ |
| 2176 '../build/linux/system.gyp:ssl', | 2173 '../build/linux/system.gyp:ssl', |
| 2177 ], | 2174 ], |
| 2178 }], | 2175 }], |
| 2179 ['OS=="mac"', { | 2176 ['OS=="mac"', { |
| 2180 'include_dirs': [ | |
| 2181 '../third_party/GTM', | |
| 2182 ], | |
| 2183 # TODO(mark): We really want this for all non-static library | 2177 # TODO(mark): We really want this for all non-static library |
| 2184 # targets, but when we tried to pull it up to the common.gypi | 2178 # targets, but when we tried to pull it up to the common.gypi |
| 2185 # level, it broke other things like the ui and startup tests. *shrug* | 2179 # level, it broke other things like the ui and startup tests. *shrug* |
| 2186 'xcode_settings': { | 2180 'xcode_settings': { |
| 2187 'OTHER_LDFLAGS': [ | 2181 'OTHER_LDFLAGS': [ |
| 2188 '-Wl,-ObjC', | 2182 '-Wl,-ObjC', |
| 2189 ], | 2183 ], |
| 2190 }, | 2184 }, |
| 2191 # Other platforms only need | 2185 # Other platforms only need |
| 2192 # chrome_resources.gyp:{packed_extra_resources,packed_resources}, | 2186 # chrome_resources.gyp:{packed_extra_resources,packed_resources}, |
| (...skipping 871 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3064 'utility', | 3058 'utility', |
| 3065 ], | 3059 ], |
| 3066 'sources': [ | 3060 'sources': [ |
| 3067 'tools/service_discovery_sniffer/service_discovery_sniffer.h', | 3061 'tools/service_discovery_sniffer/service_discovery_sniffer.h', |
| 3068 'tools/service_discovery_sniffer/service_discovery_sniffer.cc', | 3062 'tools/service_discovery_sniffer/service_discovery_sniffer.cc', |
| 3069 ], | 3063 ], |
| 3070 }] | 3064 }] |
| 3071 }], | 3065 }], |
| 3072 ], # 'conditions' | 3066 ], # 'conditions' |
| 3073 } | 3067 } |
| OLD | NEW |