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

Side by Side Diff: content/content.gyp

Issue 18119009: Make utility process run in-process when running in single-process mode. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: undo unnecessary changes Created 7 years, 5 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/browser/utility_process_host_impl.cc ('k') | content/public/common/content_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 'chromium_code': 1, # Use higher warning level. 7 'chromium_code': 1, # Use higher warning level.
8 'chromium_enable_vtune_jit_for_v8%': 0, # enable the vtune support for V8 e ngine. 8 'chromium_enable_vtune_jit_for_v8%': 0, # enable the vtune support for V8 e ngine.
9 'directxsdk_exists': '<!(python <(DEPTH)/build/dir_exists.py ../third_party/ directxsdk)', 9 'directxsdk_exists': '<!(python <(DEPTH)/build/dir_exists.py ../third_party/ directxsdk)',
10 }, 10 },
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 ], 84 ],
85 'dependencies': [ 85 'dependencies': [
86 'content_common', 86 'content_common',
87 'content_resources.gyp:content_resources', 87 'content_resources.gyp:content_resources',
88 ], 88 ],
89 'conditions': [ 89 'conditions': [
90 ['OS != "ios" and chrome_split_dll != 1', { 90 ['OS != "ios" and chrome_split_dll != 1', {
91 'dependencies': [ 91 'dependencies': [
92 'content_gpu', 92 'content_gpu',
93 'content_renderer', 93 'content_renderer',
94 'content_utility',
94 ], 95 ],
95 }], 96 }],
96 ['chrome_split_dll', { 97 ['chrome_split_dll', {
97 'dependencies': [ 98 'dependencies': [
98 'content_gpu', 99 'content_gpu',
99 ], 100 ],
100 }], 101 }],
101 ['java_bridge==1', { 102 ['java_bridge==1', {
102 'dependencies': [ 103 'dependencies': [
103 'content_child', 104 'content_child',
(...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after
454 'include_dirs': [ 455 'include_dirs': [
455 '<(SHARED_INTERMEDIATE_DIR)/content', 456 '<(SHARED_INTERMEDIATE_DIR)/content',
456 ], 457 ],
457 }, 458 },
458 'includes': [ 'content_jni.gypi' ], 459 'includes': [ 'content_jni.gypi' ],
459 }, 460 },
460 ], 461 ],
461 }], # OS == "android" 462 }], # OS == "android"
462 ], 463 ],
463 } 464 }
OLDNEW
« no previous file with comments | « content/browser/utility_process_host_impl.cc ('k') | content/public/common/content_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698