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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 8538016: Revert 109534 since this change broke clobbered component build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 1 month 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_installer_util.gypi ('k') | chrome/nacl.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 (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 # Variables for js2gtest rules 6 # Variables for js2gtest rules
7 'gypv8sh': '../tools/gypv8sh.py', 7 'gypv8sh': '../tools/gypv8sh.py',
8 'js2gtest': 'test/base/js2gtest.js', 8 'js2gtest': 'test/base/js2gtest.js',
9 'js2gtest_out_dir': '<(SHARED_INTERMEDIATE_DIR)/js2gtest', 9 'js2gtest_out_dir': '<(SHARED_INTERMEDIATE_DIR)/js2gtest',
10 'mock_js': 'third_party/mock4js/mock4js.js', 10 'mock_js': 'third_party/mock4js/mock4js.js',
(...skipping 2323 matching lines...) Expand 10 before | Expand all | Expand 10 after
2334 ], 2334 ],
2335 }], 2335 }],
2336 ['use_cups==1 and OS!="mac"', { 2336 ['use_cups==1 and OS!="mac"', {
2337 'defines': [ 2337 'defines': [
2338 'USE_CUPS', 2338 'USE_CUPS',
2339 ], 2339 ],
2340 'sources': [ 2340 'sources': [
2341 'browser/printing/print_system_task_proxy_unittest.cc', 2341 'browser/printing/print_system_task_proxy_unittest.cc',
2342 ], 2342 ],
2343 }], 2343 }],
2344 ['component == "shared_library"', {
2345 # This is needed for tests that subclass
2346 # RendererWebKitPlatformSupportImpl, which subclasses stuff in
2347 # glue, which refers to symbols defined in these files.
2348 # Hopefully this can be resolved with http://crbug.com/98755.
2349 'sources': [
2350 '../content/renderer/renderer_glue.cc',
2351 '../content/common/socket_stream_dispatcher.cc',
2352 ]},
2353 ],
2354 ], 2344 ],
2355 }, 2345 },
2356 { 2346 {
2357 # Executable that runs each browser test in a new process. 2347 # Executable that runs each browser test in a new process.
2358 'target_name': 'browser_tests', 2348 'target_name': 'browser_tests',
2359 'type': 'executable', 2349 'type': 'executable',
2360 'msvs_cygwin_shell': 0, 2350 'msvs_cygwin_shell': 0,
2361 'msvs_cygwin_dirs': ['<(DEPTH)/third_party/cygwin'], 2351 'msvs_cygwin_dirs': ['<(DEPTH)/third_party/cygwin'],
2362 'dependencies': [ 2352 'dependencies': [
2363 'browser', 2353 'browser',
(...skipping 584 matching lines...) Expand 10 before | Expand all | Expand 10 after
2948 ], 2938 ],
2949 }], 2939 }],
2950 ['target_arch!="arm"', { 2940 ['target_arch!="arm"', {
2951 'dependencies': [ 2941 'dependencies': [
2952 # build time dependency. 2942 # build time dependency.
2953 '../v8/tools/gyp/v8.gyp:v8_shell#host', 2943 '../v8/tools/gyp/v8.gyp:v8_shell#host',
2954 # run time dependency 2944 # run time dependency
2955 '../webkit/webkit.gyp:copy_npapi_test_plugin', 2945 '../webkit/webkit.gyp:copy_npapi_test_plugin',
2956 ], 2946 ],
2957 }], 2947 }],
2958 ['component == "shared_library"', {
2959 # This is needed for tests that subclass
2960 # RendererWebKitPlatformSupportImpl, which subclasses stuff in
2961 # glue, which refers to symbols defined in these files.
2962 # Hopefully this can be resolved with http://crbug.com/98755.
2963 'sources': [
2964 '../content/renderer/renderer_glue.cc',
2965 '../content/common/socket_stream_dispatcher.cc',
2966 ]},
2967 ],
2968 ], # conditions 2948 ], # conditions
2969 }, # target browser_tests 2949 }, # target browser_tests
2970 { 2950 {
2971 # Executable that runs safebrowsing test in a new process. 2951 # Executable that runs safebrowsing test in a new process.
2972 'target_name': 'safe_browsing_tests', 2952 'target_name': 'safe_browsing_tests',
2973 'type': 'executable', 2953 'type': 'executable',
2974 'dependencies': [ 2954 'dependencies': [
2975 'chrome', 2955 'chrome',
2976 'test_support_common', 2956 'test_support_common',
2977 '../base/base.gyp:base', 2957 '../base/base.gyp:base',
(...skipping 1288 matching lines...) Expand 10 before | Expand all | Expand 10 after
4266 # Use outputs of this action as inputs for the main target build. 4246 # Use outputs of this action as inputs for the main target build.
4267 # Seems as a misnomer but makes this happy on Linux (scons). 4247 # Seems as a misnomer but makes this happy on Linux (scons).
4268 'process_outputs_as_sources': 1, 4248 'process_outputs_as_sources': 1,
4269 }, 4249 },
4270 ], # 'actions' 4250 ], # 'actions'
4271 }, 4251 },
4272 ] 4252 ]
4273 }], # 'coverage!=0' 4253 }], # 'coverage!=0'
4274 ], # 'conditions' 4254 ], # 'conditions'
4275 } 4255 }
OLDNEW
« no previous file with comments | « chrome/chrome_installer_util.gypi ('k') | chrome/nacl.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698