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

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: mark review 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
« no previous file with comments | « chrome/chrome_nibs.gyp ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1870 matching lines...) Expand 10 before | Expand all | Expand 10 after
1881 'dependencies': [ 1881 'dependencies': [
1882 '../build/linux/system.gyp:gtk', 1882 '../build/linux/system.gyp:gtk',
1883 ], 1883 ],
1884 }], 1884 }],
1885 ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)' , { 1885 ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)' , {
1886 'dependencies': [ 1886 'dependencies': [
1887 '../build/linux/system.gyp:ssl', 1887 '../build/linux/system.gyp:ssl',
1888 ], 1888 ],
1889 }], 1889 }],
1890 ['OS=="mac"', { 1890 ['OS=="mac"', {
1891 'include_dirs': [
1892 '../third_party/GTM',
1893 ],
1894 # TODO(mark): We really want this for all non-static library 1891 # TODO(mark): We really want this for all non-static library
1895 # targets, but when we tried to pull it up to the common.gypi 1892 # targets, but when we tried to pull it up to the common.gypi
1896 # level, it broke other things like the ui and startup tests. *shrug* 1893 # level, it broke other things like the ui and startup tests. *shrug*
1897 'xcode_settings': { 1894 'xcode_settings': {
1898 'OTHER_LDFLAGS': [ 1895 'OTHER_LDFLAGS': [
1899 '-Wl,-ObjC', 1896 '-Wl,-ObjC',
1900 ], 1897 ],
1901 }, 1898 },
1902 # Other platforms only need 1899 # Other platforms only need
1903 # chrome_resources.gyp:{packed_extra_resources,packed_resources}, 1900 # chrome_resources.gyp:{packed_extra_resources,packed_resources},
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
2175 'dependencies': [ 2172 'dependencies': [
2176 '../build/linux/system.gyp:gtk', 2173 '../build/linux/system.gyp:gtk',
2177 ], 2174 ],
2178 }], 2175 }],
2179 ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)' , { 2176 ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)' , {
2180 'dependencies': [ 2177 'dependencies': [
2181 '../build/linux/system.gyp:ssl', 2178 '../build/linux/system.gyp:ssl',
2182 ], 2179 ],
2183 }], 2180 }],
2184 ['OS=="mac"', { 2181 ['OS=="mac"', {
2185 'include_dirs': [
2186 '../third_party/GTM',
2187 ],
2188 # TODO(mark): We really want this for all non-static library 2182 # TODO(mark): We really want this for all non-static library
2189 # 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
2190 # 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*
2191 'xcode_settings': { 2185 'xcode_settings': {
2192 'OTHER_LDFLAGS': [ 2186 'OTHER_LDFLAGS': [
2193 '-Wl,-ObjC', 2187 '-Wl,-ObjC',
2194 ], 2188 ],
2195 }, 2189 },
2196 # Other platforms only need 2190 # Other platforms only need
2197 # chrome_resources.gyp:{packed_extra_resources,packed_resources}, 2191 # chrome_resources.gyp:{packed_extra_resources,packed_resources},
(...skipping 872 matching lines...) Expand 10 before | Expand all | Expand 10 after
3070 'utility', 3064 'utility',
3071 ], 3065 ],
3072 'sources': [ 3066 'sources': [
3073 'tools/service_discovery_sniffer/service_discovery_sniffer.h', 3067 'tools/service_discovery_sniffer/service_discovery_sniffer.h',
3074 'tools/service_discovery_sniffer/service_discovery_sniffer.cc', 3068 'tools/service_discovery_sniffer/service_discovery_sniffer.cc',
3075 ], 3069 ],
3076 }] 3070 }]
3077 }], 3071 }],
3078 ], # 'conditions' 3072 ], # 'conditions'
3079 } 3073 }
OLDNEW
« no previous file with comments | « 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