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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 13923005: Temporarily adding libpeerconnection as a dependency on three test targets that fail to link on luc… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | 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 'pyautolib_sources': [ 6 'pyautolib_sources': [
7 'app/chrome_command_ids.h', 7 'app/chrome_command_ids.h',
8 'app/chrome_dll_resource.h', 8 'app/chrome_dll_resource.h',
9 'common/automation_constants.h', 9 'common/automation_constants.h',
10 'common/pref_names.cc', 10 'common/pref_names.cc',
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 '<(DEPTH)/third_party/wtl/include', 129 '<(DEPTH)/third_party/wtl/include',
130 ], 130 ],
131 'conditions': [ 131 'conditions': [
132 ['win_use_allocator_shim==1', { 132 ['win_use_allocator_shim==1', {
133 'dependencies': [ 133 'dependencies': [
134 '<(allocator_target)', 134 '<(allocator_target)',
135 ], 135 ],
136 }], 136 }],
137 ], 137 ],
138 }], 138 }],
139 ['OS=="linux" and enable_webrtc==1', {
140 'dependencies': [
141 # TODO(tommi): Figure out why the 32bit lucid builder fails to
142 # find this dependency for this target (other builders pick it up
143 # correctly). crbug.com/231068.
144 '../third_party/libjingle/libjingle.gyp:libpeerconnection',
145 ],
146 }],
139 ], 147 ],
140 }, 148 },
141 { 149 {
142 'target_name': 'interactive_ui_tests', 150 'target_name': 'interactive_ui_tests',
143 'type': 'executable', 151 'type': 'executable',
144 'dependencies': [ 152 'dependencies': [
145 'browser', 153 'browser',
146 'chrome_resources.gyp:chrome_resources', 154 'chrome_resources.gyp:chrome_resources',
147 'chrome_resources.gyp:chrome_strings', 155 'chrome_resources.gyp:chrome_strings',
148 'chrome_resources.gyp:packed_extra_resources', 156 'chrome_resources.gyp:packed_extra_resources',
(...skipping 2065 matching lines...) Expand 10 before | Expand all | Expand 10 after
2214 }, 2222 },
2215 }, 2223 },
2216 }, 2224 },
2217 }, 2225 },
2218 },], 2226 },],
2219 ['toolkit_uses_gtk == 1', { 2227 ['toolkit_uses_gtk == 1', {
2220 'dependencies': [ 2228 'dependencies': [
2221 '../build/linux/system.gyp:gtk', 2229 '../build/linux/system.gyp:gtk',
2222 ], 2230 ],
2223 },], 2231 },],
2232 ['OS=="linux" and enable_webrtc==1', {
2233 'dependencies': [
2234 # TODO(tommi): Figure out why the 32bit lucid builder fails to
2235 # find this dependency for this target (other builders pick it up
2236 # correctly). crbug.com/231068.
2237 '../third_party/libjingle/libjingle.gyp:libpeerconnection',
2238 ],
2239 }],
2224 ], 2240 ],
2225 }, 2241 },
2226 { 2242 {
2227 'target_name': 'performance_ui_tests', 2243 'target_name': 'performance_ui_tests',
2228 'type': 'executable', 2244 'type': 'executable',
2229 'dependencies': [ 2245 'dependencies': [
2230 'chrome', 2246 'chrome',
2231 'chrome_resources.gyp:chrome_resources', 2247 'chrome_resources.gyp:chrome_resources',
2232 'chrome_resources.gyp:chrome_strings', 2248 'chrome_resources.gyp:chrome_strings',
2233 'debugger', 2249 'debugger',
(...skipping 546 matching lines...) Expand 10 before | Expand all | Expand 10 after
2780 }], 2796 }],
2781 ['os_posix == 1 and OS != "mac" and OS != "android"', { 2797 ['os_posix == 1 and OS != "mac" and OS != "android"', {
2782 'conditions': [ 2798 'conditions': [
2783 ['linux_use_tcmalloc==1', { 2799 ['linux_use_tcmalloc==1', {
2784 'dependencies': [ 2800 'dependencies': [
2785 '../base/allocator/allocator.gyp:allocator', 2801 '../base/allocator/allocator.gyp:allocator',
2786 ], 2802 ],
2787 }], 2803 }],
2788 ], 2804 ],
2789 }], 2805 }],
2806 ['OS=="linux" and enable_webrtc==1', {
2807 'dependencies': [
2808 # TODO(tommi): Figure out why the 32bit lucid builder fails to
2809 # find this dependency for this target (other builders pick it u p
2810 # correctly). crbug.com/231068.
2811 '../third_party/libjingle/libjingle.gyp:libpeerconnection',
2812 ],
2813 }],
2790 ], 2814 ],
2791 }, 2815 },
2792 ], 2816 ],
2793 },], # OS!="mac" 2817 },], # OS!="mac"
2794 ['OS=="win"', { 2818 ['OS=="win"', {
2795 'targets': [ 2819 'targets': [
2796 { 2820 {
2797 'target_name': 'security_tests', 2821 'target_name': 'security_tests',
2798 'type': 'shared_library', 2822 'type': 'shared_library',
2799 'include_dirs': [ 2823 'include_dirs': [
(...skipping 521 matching lines...) Expand 10 before | Expand all | Expand 10 after
3321 # more details. 3345 # more details.
3322 'DebugInformationFormat': '3', 3346 'DebugInformationFormat': '3',
3323 'ProgramDataBaseFileName': '<(PRODUCT_DIR)/browser_tests.exe.pdb', 3347 'ProgramDataBaseFileName': '<(PRODUCT_DIR)/browser_tests.exe.pdb',
3324 }, 3348 },
3325 }, 3349 },
3326 }, 3350 },
3327 ], 3351 ],
3328 }], 3352 }],
3329 ], # 'conditions' 3353 ], # 'conditions'
3330 } 3354 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698