Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(60)

Side by Side Diff: chrome/chrome_tests.gypi

Issue 107933006: Get rid of ui_cocoa_third_party_toolkits target from ui.gyp (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase DEPS Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 1866 matching lines...) Expand 10 before | Expand all | Expand 10 after
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': [ 1886 'include_dirs': [
1887 '../third_party/GTM', 1887 '../third_party/google_toolbox_for_mac/src',
1888 ], 1888 ],
1889 # TODO(mark): We really want this for all non-static library 1889 # 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 1890 # 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* 1891 # level, it broke other things like the ui and startup tests. *shrug*
1892 'xcode_settings': { 1892 'xcode_settings': {
1893 'OTHER_LDFLAGS': [ 1893 'OTHER_LDFLAGS': [
1894 '-Wl,-ObjC', 1894 '-Wl,-ObjC',
1895 ], 1895 ],
1896 }, 1896 },
1897 # Other platforms only need 1897 # Other platforms only need
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
2171 '../build/linux/system.gyp:gtk', 2171 '../build/linux/system.gyp:gtk',
2172 ], 2172 ],
2173 }], 2173 }],
2174 ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)' , { 2174 ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)' , {
2175 'dependencies': [ 2175 'dependencies': [
2176 '../build/linux/system.gyp:ssl', 2176 '../build/linux/system.gyp:ssl',
2177 ], 2177 ],
2178 }], 2178 }],
2179 ['OS=="mac"', { 2179 ['OS=="mac"', {
2180 'include_dirs': [ 2180 'include_dirs': [
2181 '../third_party/GTM', 2181 '../third_party/google_toolbox_for_mac/src',
2182 ], 2182 ],
2183 # TODO(mark): We really want this for all non-static library 2183 # 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 2184 # 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* 2185 # level, it broke other things like the ui and startup tests. *shrug*
2186 'xcode_settings': { 2186 'xcode_settings': {
2187 'OTHER_LDFLAGS': [ 2187 'OTHER_LDFLAGS': [
2188 '-Wl,-ObjC', 2188 '-Wl,-ObjC',
2189 ], 2189 ],
2190 }, 2190 },
2191 # Other platforms only need 2191 # Other platforms only need
(...skipping 872 matching lines...) Expand 10 before | Expand all | Expand 10 after
3064 'utility', 3064 'utility',
3065 ], 3065 ],
3066 'sources': [ 3066 'sources': [
3067 'tools/service_discovery_sniffer/service_discovery_sniffer.h', 3067 'tools/service_discovery_sniffer/service_discovery_sniffer.h',
3068 'tools/service_discovery_sniffer/service_discovery_sniffer.cc', 3068 'tools/service_discovery_sniffer/service_discovery_sniffer.cc',
3069 ], 3069 ],
3070 }] 3070 }]
3071 }], 3071 }],
3072 ], # 'conditions' 3072 ], # 'conditions'
3073 } 3073 }
OLDNEW
« chrome/DEPS ('K') | « chrome/chrome_nibs.gyp ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698