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

Side by Side Diff: content/content_tests.gypi

Issue 187183002: Add creation of ServiceManager to Content (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge problem Created 6 years, 9 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 | « content/content_common.gypi ('k') | mojo/gles2/command_buffer_client_impl.cc » ('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 952 matching lines...) Expand 10 before | Expand all | Expand 10 after
963 '..', 963 '..',
964 '<(SHARED_INTERMEDIATE_DIR)', # Needed by encrypted_media_browserte st.cc 964 '<(SHARED_INTERMEDIATE_DIR)', # Needed by encrypted_media_browserte st.cc
965 ], 965 ],
966 'includes': [ 966 'includes': [
967 'browser/gpu/test_support_gpu.gypi', 967 'browser/gpu/test_support_gpu.gypi',
968 ], 968 ],
969 'defines': [ 969 'defines': [
970 'HAS_OUT_OF_PROC_TEST_RUNNER', 970 'HAS_OUT_OF_PROC_TEST_RUNNER',
971 ], 971 ],
972 'sources': [ 972 'sources': [
973 'app/mojo/mojo_browsertest.cc',
973 'browser/accessibility/accessibility_win_browsertest.cc', 974 'browser/accessibility/accessibility_win_browsertest.cc',
974 'browser/accessibility/cross_platform_accessibility_browsertest.cc', 975 'browser/accessibility/cross_platform_accessibility_browsertest.cc',
975 'browser/accessibility/dump_accessibility_tree_browsertest.cc', 976 'browser/accessibility/dump_accessibility_tree_browsertest.cc',
976 'browser/compositor/image_transport_factory_browsertest.cc', 977 'browser/compositor/image_transport_factory_browsertest.cc',
977 'browser/bookmarklet_browsertest.cc', 978 'browser/bookmarklet_browsertest.cc',
978 'browser/browser_plugin/browser_plugin_host_browsertest.cc', 979 'browser/browser_plugin/browser_plugin_host_browsertest.cc',
979 'browser/browser_plugin/test_browser_plugin_guest.cc', 980 'browser/browser_plugin/test_browser_plugin_guest.cc',
980 'browser/browser_plugin/test_browser_plugin_guest.h', 981 'browser/browser_plugin/test_browser_plugin_guest.h',
981 'browser/browser_plugin/test_browser_plugin_guest_delegate.cc', 982 'browser/browser_plugin/test_browser_plugin_guest_delegate.cc',
982 'browser/browser_plugin/test_browser_plugin_guest_delegate.h', 983 'browser/browser_plugin/test_browser_plugin_guest_delegate.h',
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
1140 ['use_aura==1 or toolkit_views==1', { 1141 ['use_aura==1 or toolkit_views==1', {
1141 'dependencies': [ 1142 'dependencies': [
1142 '../ui/events/events.gyp:events_test_support', 1143 '../ui/events/events.gyp:events_test_support',
1143 ], 1144 ],
1144 }], 1145 }],
1145 ['use_aura!=1 and OS!="mac"', { 1146 ['use_aura!=1 and OS!="mac"', {
1146 'sources/': [ 1147 'sources/': [
1147 ['exclude', '^browser/compositor/'], 1148 ['exclude', '^browser/compositor/'],
1148 ], 1149 ],
1149 }], 1150 }],
1151 ['use_mojo==1', {
1152 'dependencies': [
1153 '../mojo/mojo.gyp:mojo_environment_chromium',
1154 '../mojo/mojo.gyp:mojo_service_manager',
1155 ],
1156 },{
1157 'sources!': [
1158 'app/mojo/mojo_browsertest.cc',
1159 ],
1160 }],
1150 ['OS!="android" and OS!="ios"', { 1161 ['OS!="android" and OS!="ios"', {
1151 # npapi test plugin doesn't build on android or ios 1162 # npapi test plugin doesn't build on android or ios
1152 'dependencies': [ 1163 'dependencies': [
1153 # Runtime dependencies 1164 # Runtime dependencies
1154 'copy_npapi_test_plugin', 1165 'copy_npapi_test_plugin',
1155 ], 1166 ],
1156 }], 1167 }],
1157 ['enable_webrtc==1', { 1168 ['enable_webrtc==1', {
1158 'sources': [ 1169 'sources': [
1159 'browser/media/webrtc_aecdump_browsertest.cc', 1170 'browser/media/webrtc_aecdump_browsertest.cc',
(...skipping 560 matching lines...) Expand 10 before | Expand all | Expand 10 after
1720 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'], 1731 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'],
1721 }, 1732 },
1722 ], 1733 ],
1723 }], 1734 }],
1724 ], 1735 ],
1725 }, 1736 },
1726 ], 1737 ],
1727 }], 1738 }],
1728 ], 1739 ],
1729 } 1740 }
OLDNEW
« no previous file with comments | « content/content_common.gypi ('k') | mojo/gles2/command_buffer_client_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698