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

Side by Side Diff: content/content_tests.gypi

Issue 151713003: Clean up dependencies on X11 libraries (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix chromeos=1 links Created 6 years, 10 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 | « chrome/chrome_tests.gypi ('k') | gpu/tools/tools.gyp » ('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 (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 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 { 5 {
6 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'test_support_content', 8 'target_name': 'test_support_content',
9 'type': 'static_library', 9 'type': 'static_library',
10 'dependencies': [ 10 'dependencies': [
(...skipping 1284 matching lines...) Expand 10 before | Expand all | Expand 10 after
1295 ' linux_use_tcmalloc==1)', { 1295 ' linux_use_tcmalloc==1)', {
1296 'dependencies': [ 1296 'dependencies': [
1297 '../base/allocator/allocator.gyp:allocator', 1297 '../base/allocator/allocator.gyp:allocator',
1298 ], 1298 ],
1299 }], 1299 }],
1300 ['target_arch != "arm" and (OS=="linux" or chromeos == 1)', { 1300 ['target_arch != "arm" and (OS=="linux" or chromeos == 1)', {
1301 'include_dirs': [ 1301 'include_dirs': [
1302 '<(DEPTH)/third_party/libva', 1302 '<(DEPTH)/third_party/libva',
1303 ], 1303 ],
1304 }], 1304 }],
1305 ['use_x11==1', {
1306 'dependencies': [
1307 '../build/linux/system.gyp:x11', # Used by rendering_helper.c c
1308 ],
1309 }],
1305 ], 1310 ],
1306 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 1311 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
1307 'msvs_disabled_warnings': [ 4267, ], 1312 'msvs_disabled_warnings': [ 4267, ],
1308 }, 1313 },
1309 ] 1314 ]
1310 }], 1315 }],
1311 ['chromeos==1 and target_arch == "arm"', { 1316 ['chromeos==1 and target_arch == "arm"', {
1312 'targets': [ 1317 'targets': [
1313 { 1318 {
1314 'target_name': 'video_encode_accelerator_unittest', 1319 'target_name': 'video_encode_accelerator_unittest',
(...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after
1637 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'], 1642 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'],
1638 }, 1643 },
1639 ], 1644 ],
1640 }], 1645 }],
1641 ], 1646 ],
1642 }, 1647 },
1643 ], 1648 ],
1644 }], 1649 }],
1645 ], 1650 ],
1646 } 1651 }
OLDNEW
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | gpu/tools/tools.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698