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

Side by Side Diff: content/content.gyp

Issue 14823005: Remove inside_chromium_build gyp variable (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sort gyps, fix ios Created 7 years, 7 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/devtools/devtools_resources.gyp ('k') | content/content_browser.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 'directxsdk_exists': '<!(python <(DEPTH)/build/dir_exists.py ../third_party/ directxsdk)', 8 'directxsdk_exists': '<!(python <(DEPTH)/build/dir_exists.py ../third_party/ directxsdk)',
9 'conditions': [
10 ['inside_chromium_build==0', {
11 'webkit_src_dir': '../../../..',
12 },{
13 'webkit_src_dir': '../third_party/WebKit',
14 }],
15 ],
16 }, 9 },
17 'target_defaults': { 10 'target_defaults': {
18 'defines': ['CONTENT_IMPLEMENTATION'], 11 'defines': ['CONTENT_IMPLEMENTATION'],
19 'conditions': [ 12 'conditions': [
20 ['inside_chromium_build==0', {
21 'dependencies': [
22 '../webkit/support/setup_third_party.gyp:third_party_headers',
23 ],
24 }],
25 # TODO(jschuh): Remove this after crbug.com/173851 gets fixed. 13 # TODO(jschuh): Remove this after crbug.com/173851 gets fixed.
26 ['OS=="win" and target_arch=="x64"', { 14 ['OS=="win" and target_arch=="x64"', {
27 'msvs_settings': { 15 'msvs_settings': {
28 'VCCLCompilerTool': { 16 'VCCLCompilerTool': {
29 'AdditionalOptions': ['/bigobj'], 17 'AdditionalOptions': ['/bigobj'],
30 }, 18 },
31 }, 19 },
32 }], 20 }],
33 ], 21 ],
34 }, 22 },
23 'includes': [
24 'content_tests.gypi',
25 ],
35 'conditions': [ 26 'conditions': [
36 ['inside_chromium_build==1', {
37 'includes': [
38 'content_tests.gypi',
39 ],
40 }],
41 ['OS != "ios"', { 27 ['OS != "ios"', {
42 'includes': [ 28 'includes': [
43 '../build/win_precompile.gypi', 29 '../build/win_precompile.gypi',
44 'content_shell.gypi', 30 'content_shell.gypi',
45 ], 31 ],
46 }], 32 }],
47 # In component mode, we build all of content as a single DLL. 33 # In component mode, we build all of content as a single DLL.
48 # However, in the static mode, we need to build content as multiple 34 # However, in the static mode, we need to build content as multiple
49 # targets in order to prevent dependencies from getting introduced 35 # targets in order to prevent dependencies from getting introduced
50 # upstream unnecessarily (e.g., content_renderer depends on allocator 36 # upstream unnecessarily (e.g., content_renderer depends on allocator
(...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after
391 'include_dirs': [ 377 'include_dirs': [
392 '<(SHARED_INTERMEDIATE_DIR)/content', 378 '<(SHARED_INTERMEDIATE_DIR)/content',
393 ], 379 ],
394 }, 380 },
395 'includes': [ 'content_jni.gypi' ], 381 'includes': [ 'content_jni.gypi' ],
396 }, 382 },
397 ], 383 ],
398 }], # OS == "android" 384 }], # OS == "android"
399 ], 385 ],
400 } 386 }
OLDNEW
« no previous file with comments | « content/browser/devtools/devtools_resources.gyp ('k') | content/content_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698