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