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

Side by Side Diff: content/content_tests.gypi

Issue 601263002: Update content and media unittest isolate targets. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix merge conflict 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 | media/media.gyp » ('j') | media/media_unittests.isolate » ('J')
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 984 matching lines...) Expand 10 before | Expand all | Expand 10 after
995 'dependencies': [ 995 'dependencies': [
996 'content_unittests', 996 'content_unittests',
997 ], 997 ],
998 'includes': [ 998 'includes': [
999 '../build/isolate.gypi', 999 '../build/isolate.gypi',
1000 'content_unittests.isolate', 1000 'content_unittests.isolate',
1001 ], 1001 ],
1002 'sources': [ 1002 'sources': [
1003 'content_unittests.isolate', 1003 'content_unittests.isolate',
1004 ], 1004 ],
1005 'conditions': [
1006 ['OS=="linux" and use_ozone==0', {
1007 'dependencies': [
1008 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
1009 ],
1010 }],
1011 ],
1005 }, 1012 },
1006 ], 1013 ],
1007 'conditions': [ 1014 'conditions': [
1008 ['archive_gpu_tests==1', { 1015 ['archive_gpu_tests==1', {
1009 'targets': [ 1016 'targets': [
1010 { 1017 {
1011 'target_name': 'content_gl_tests_run', 1018 'target_name': 'content_gl_tests_run',
1012 'type': 'none', 1019 'type': 'none',
1013 'dependencies': [ 1020 'dependencies': [
1014 'content_shell_and_tests.gyp:content_gl_tests', 1021 'content_shell_and_tests.gyp:content_gl_tests',
(...skipping 917 matching lines...) Expand 10 before | Expand all | Expand 10 after
1932 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'], 1939 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'],
1933 }, 1940 },
1934 ], 1941 ],
1935 }], 1942 }],
1936 ], 1943 ],
1937 }, 1944 },
1938 ], 1945 ],
1939 }], 1946 }],
1940 ], 1947 ],
1941 } 1948 }
OLDNEW
« no previous file with comments | « no previous file | media/media.gyp » ('j') | media/media_unittests.isolate » ('J')

Powered by Google App Engine
This is Rietveld 408576698