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

Side by Side Diff: content/content.gyp

Issue 226213002: Removes use_mojo (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge 2 trunk Created 6 years, 8 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/common/content_message_generator.h ('k') | content/content_app.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) 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 },
11 'target_defaults': { 11 'target_defaults': {
12 'defines': ['CONTENT_IMPLEMENTATION'], 12 'defines': ['CONTENT_IMPLEMENTATION'],
13 'conditions': [ 13 'conditions': [
14 # TODO(jschuh): Remove this after crbug.com/173851 gets fixed. 14 # TODO(jschuh): Remove this after crbug.com/173851 gets fixed.
15 ['OS=="win" and target_arch=="x64"', { 15 ['OS=="win" and target_arch=="x64"', {
16 'msvs_settings': { 16 'msvs_settings': {
17 'VCCLCompilerTool': { 17 'VCCLCompilerTool': {
18 'AdditionalOptions': ['/bigobj'], 18 'AdditionalOptions': ['/bigobj'],
19 }, 19 },
20 }, 20 },
21 }], 21 }],
22 ], 22 ],
23 }, 23 },
24 'conditions': [ 24 'conditions': [
25 ['use_mojo==1', { 25 ['OS != "ios"', {
26 'includes': [ 26 'includes': [
27 'content_common_mojo_bindings.gypi', 27 'content_common_mojo_bindings.gypi',
28 ],
29 }],
30 ['OS != "ios"', {
31 'includes': [
32 '../build/win_precompile.gypi', 28 '../build/win_precompile.gypi',
33 ], 29 ],
34 'targets': [ 30 'targets': [
35 { 31 {
36 'target_name': 'webkit_version', 32 'target_name': 'webkit_version',
37 'type': 'none', 33 'type': 'none',
38 'actions': [ 34 'actions': [
39 { 35 {
40 'action_name': 'generate_webkit_version', 36 'action_name': 'generate_webkit_version',
41 'inputs': [ 37 'inputs': [
(...skipping 533 matching lines...) Expand 10 before | Expand all | Expand 10 after
575 ], 571 ],
576 }, 572 },
577 ], 573 ],
578 }], 574 }],
579 ], 575 ],
580 }, 576 },
581 ], 577 ],
582 }], # OS == "android" 578 }], # OS == "android"
583 ], 579 ],
584 } 580 }
OLDNEW
« no previous file with comments | « content/common/content_message_generator.h ('k') | content/content_app.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698