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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 23868020: Fix remaining shared_library link_settings propagation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 7 years, 2 months 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
« no previous file with comments | « chrome/chrome_browser_ui.gypi ('k') | content/content_browser.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 740 matching lines...) Expand 10 before | Expand all | Expand 10 after
751 'message': 'Generating version info', 751 'message': 'Generating version info',
752 }, 752 },
753 ], 753 ],
754 'direct_dependent_settings': { 754 'direct_dependent_settings': {
755 'include_dirs': [ 755 'include_dirs': [
756 '<(SHARED_INTERMEDIATE_DIR)', 756 '<(SHARED_INTERMEDIATE_DIR)',
757 ], 757 ],
758 }, 758 },
759 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 759 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
760 'msvs_disabled_warnings': [ 4267, ], 760 'msvs_disabled_warnings': [ 4267, ],
761 'conditions': [
762 ['OS=="mac"', {
763 'link_settings': {
764 'libraries': [
765 '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
766 ],
767 },
768 }],
769 ],
761 }, 770 },
762 { 771 {
763 'target_name': 'chromedriver', 772 'target_name': 'chromedriver',
764 'type': 'executable', 773 'type': 'executable',
765 'dependencies': [ 774 'dependencies': [
766 'chromedriver_lib', 775 'chromedriver_lib',
767 ], 776 ],
768 'include_dirs': [ 777 'include_dirs': [
769 '..', 778 '..',
770 ], 779 ],
(...skipping 2406 matching lines...) Expand 10 before | Expand all | Expand 10 after
3177 'utility', 3186 'utility',
3178 ], 3187 ],
3179 'sources': [ 3188 'sources': [
3180 'tools/service_discovery_sniffer/service_discovery_sniffer.h', 3189 'tools/service_discovery_sniffer/service_discovery_sniffer.h',
3181 'tools/service_discovery_sniffer/service_discovery_sniffer.cc', 3190 'tools/service_discovery_sniffer/service_discovery_sniffer.cc',
3182 ], 3191 ],
3183 }] 3192 }]
3184 }], 3193 }],
3185 ], # 'conditions' 3194 ], # 'conditions'
3186 } 3195 }
OLDNEW
« no previous file with comments | « chrome/chrome_browser_ui.gypi ('k') | content/content_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698