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

Side by Side Diff: content/content_shell.gypi

Issue 12258047: [content shell] Use the TestRunner library again and remove the mock testRunner (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | « no previous file | content/shell/shell_content_renderer_client.h » ('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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'content_shell_product_name': 'Content Shell', 7 'content_shell_product_name': 'Content Shell',
8 # The "19" is so that sites that sniff for version think that this is 8 # The "19" is so that sites that sniff for version think that this is
9 # something reasonably current; the "77.34.5" is a hint that this isn't a 9 # something reasonably current; the "77.34.5" is a hint that this isn't a
10 # standard Chrome. 10 # standard Chrome.
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 'shell/webkit_test_controller.h', 126 'shell/webkit_test_controller.h',
127 'shell/webkit_test_helpers.cc', 127 'shell/webkit_test_helpers.cc',
128 'shell/webkit_test_helpers.h', 128 'shell/webkit_test_helpers.h',
129 'shell/webkit_test_platform_support.h', 129 'shell/webkit_test_platform_support.h',
130 'shell/webkit_test_platform_support_android.cc', 130 'shell/webkit_test_platform_support_android.cc',
131 'shell/webkit_test_platform_support_linux.cc', 131 'shell/webkit_test_platform_support_linux.cc',
132 'shell/webkit_test_platform_support_mac.mm', 132 'shell/webkit_test_platform_support_mac.mm',
133 'shell/webkit_test_platform_support_win.cc', 133 'shell/webkit_test_platform_support_win.cc',
134 'shell/webkit_test_runner.cc', 134 'shell/webkit_test_runner.cc',
135 'shell/webkit_test_runner.h', 135 'shell/webkit_test_runner.h',
136 'shell/webkit_test_runner_bindings.cc',
137 'shell/webkit_test_runner_bindings.h',
138 ], 136 ],
139 'msvs_settings': { 137 'msvs_settings': {
140 'VCLinkerTool': { 138 'VCLinkerTool': {
141 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 139 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
142 }, 140 },
143 }, 141 },
144 'conditions': [ 142 'conditions': [
145 ['OS=="win" and win_use_allocator_shim==1', { 143 ['OS=="win" and win_use_allocator_shim==1', {
146 'dependencies': [ 144 'dependencies': [
147 '../base/allocator/allocator.gyp:allocator', 145 '../base/allocator/allocator.gyp:allocator',
(...skipping 518 matching lines...) Expand 10 before | Expand all | Expand 10 after
666 'native_libs_paths': ['<(SHARED_LIB_DIR)/libcontent_shell_content_vi ew.so'], 664 'native_libs_paths': ['<(SHARED_LIB_DIR)/libcontent_shell_content_vi ew.so'],
667 'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/cont ent_shell.pak'], 665 'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/cont ent_shell.pak'],
668 'asset_location': '<(ant_build_out)/content_shell/assets', 666 'asset_location': '<(ant_build_out)/content_shell/assets',
669 }, 667 },
670 'includes': [ '../build/java_apk.gypi' ], 668 'includes': [ '../build/java_apk.gypi' ],
671 }, 669 },
672 ], 670 ],
673 }], # OS=="android" 671 }], # OS=="android"
674 ] 672 ]
675 } 673 }
OLDNEW
« no previous file with comments | « no previous file | content/shell/shell_content_renderer_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698