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

Side by Side Diff: build/common.gypi

Issue 115182: Do not define __ARMEL__ on ARM, this is the compilers job. (Closed)
Patch Set: Created 11 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
« no previous file with comments | « no previous file | no next file » | 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) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 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 # .gyp files should set chromium_code to 1 if they build Chromium-specific 7 # .gyp files should set chromium_code to 1 if they build Chromium-specific
8 # code, as opposed to external code. This variable is used to control 8 # code, as opposed to external code. This variable is used to control
9 # such things as the set of warnings to enable, and whether warnings are 9 # such things as the set of warnings to enable, and whether warnings are
10 # treated as errors. 10 # treated as errors.
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 # To allow local gyp files to prevent release.vsprops from being included. 48 # To allow local gyp files to prevent release.vsprops from being included.
49 # Yes(1) means include release.vsprops. 49 # Yes(1) means include release.vsprops.
50 # Once all vsprops settings are migrated into gyp, this can go away. 50 # Once all vsprops settings are migrated into gyp, this can go away.
51 'msvs_use_common_release%': 1, 51 'msvs_use_common_release%': 1,
52 52
53 # The architecture that we're building on. 53 # The architecture that we're building on.
54 'target_arch%': 'ia32', 54 'target_arch%': 'ia32',
55 }, 55 },
56 'target_defaults': { 56 'target_defaults': {
57 'conditions': [ 57 'conditions': [
58 ['target_arch=="arm"', {
59 'defines': ['__ARMEL__'],
60 }],
61 ['branding=="Chrome"', { 58 ['branding=="Chrome"', {
62 'defines': ['GOOGLE_CHROME_BUILD'], 59 'defines': ['GOOGLE_CHROME_BUILD'],
63 }, { # else: branding!="Chrome" 60 }, { # else: branding!="Chrome"
64 'defines': ['CHROMIUM_BUILD'], 61 'defines': ['CHROMIUM_BUILD'],
65 }], 62 }],
66 ['coverage!=0', { 63 ['coverage!=0', {
67 'conditions': [ 64 'conditions': [
68 ['OS=="mac"', { 65 ['OS=="mac"', {
69 'xcode_settings': { 66 'xcode_settings': {
70 'GCC_INSTRUMENT_PROGRAM_FLOW_ARCS': 'YES', 67 'GCC_INSTRUMENT_PROGRAM_FLOW_ARCS': 'YES',
(...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after
454 # settings in target dicts. SYMROOT is a special case, because many other 451 # settings in target dicts. SYMROOT is a special case, because many other
455 # Xcode variables depend on it, including variables such as 452 # Xcode variables depend on it, including variables such as
456 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 453 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
457 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 454 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
458 # files to appear (when present) in the UI as actual files and not red 455 # files to appear (when present) in the UI as actual files and not red
459 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 456 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
460 # and therefore SYMROOT, needs to be set at the project level. 457 # and therefore SYMROOT, needs to be set at the project level.
461 'SYMROOT': '<(DEPTH)/xcodebuild', 458 'SYMROOT': '<(DEPTH)/xcodebuild',
462 }, 459 },
463 } 460 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698