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

Side by Side Diff: content/content_tests.gypi

Issue 669883002: fix broken xdisplaycheck dependency (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: just check use_x11 Created 6 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 | « 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 (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 'variables': { 6 'variables': {
7 'layouttest_support_content_sources': [ 7 'layouttest_support_content_sources': [
8 'public/test/layouttest_support.h', 8 'public/test/layouttest_support.h',
9 'public/test/nested_message_pump_android.cc', 9 'public/test/nested_message_pump_android.cc',
10 'public/test/nested_message_pump_android.h', 10 'public/test/nested_message_pump_android.h',
(...skipping 980 matching lines...) Expand 10 before | Expand all | Expand 10 after
991 'dependencies': [ 991 'dependencies': [
992 'content_unittests', 992 'content_unittests',
993 ], 993 ],
994 'includes': [ 994 'includes': [
995 '../build/isolate.gypi', 995 '../build/isolate.gypi',
996 ], 996 ],
997 'sources': [ 997 'sources': [
998 'content_unittests.isolate', 998 'content_unittests.isolate',
999 ], 999 ],
1000 'conditions': [ 1000 'conditions': [
1001 ['OS=="linux" and use_ozone==0', { 1001 ['use_x11==1', {
1002 'dependencies': [ 1002 'dependencies': [
1003 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 1003 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
1004 ], 1004 ],
1005 }], 1005 }],
1006 ], 1006 ],
1007 }, 1007 },
1008 ], 1008 ],
1009 'conditions': [ 1009 'conditions': [
1010 ['archive_gpu_tests==1', { 1010 ['archive_gpu_tests==1', {
1011 'targets': [ 1011 'targets': [
(...skipping 917 matching lines...) Expand 10 before | Expand all | Expand 10 after
1929 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'], 1929 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'],
1930 }, 1930 },
1931 ], 1931 ],
1932 }], 1932 }],
1933 ], 1933 ],
1934 }, 1934 },
1935 ], 1935 ],
1936 }], 1936 }],
1937 ], 1937 ],
1938 } 1938 }
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