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

Side by Side Diff: build/common.gypi

Issue 730173002: Switch the Mac build from 32-bit to 64-bit. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Roll NaCl Created 6 years, 1 month 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 | « DEPS ('k') | 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) 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 # IMPORTANT: 5 # IMPORTANT:
6 # Please don't directly include this file if you are building via gyp_chromium, 6 # Please don't directly include this file if you are building via gyp_chromium,
7 # since gyp_chromium is automatically forcing its inclusion. 7 # since gyp_chromium is automatically forcing its inclusion.
8 { 8 {
9 # Variables expected to be overriden on the GYP command line (-D) or by 9 # Variables expected to be overriden on the GYP command line (-D) or by
10 # ~/.gyp/include.gypi. 10 # ~/.gyp/include.gypi.
(...skipping 23 matching lines...) Expand all
34 'use_cras%': 0, 34 'use_cras%': 0,
35 35
36 # Use a raw surface abstraction. 36 # Use a raw surface abstraction.
37 'use_ozone%': 0, 37 'use_ozone%': 0,
38 38
39 # Configure the build for small devices. See crbug.com/318413 39 # Configure the build for small devices. See crbug.com/318413
40 'embedded%': 0, 40 'embedded%': 0,
41 41
42 'conditions': [ 42 'conditions': [
43 # Compute the architecture that we're building on. 43 # Compute the architecture that we're building on.
44 ['OS=="win" or OS=="mac" or OS=="ios"', { 44 ['OS=="win" or OS=="ios"', {
45 'host_arch%': 'ia32', 45 'host_arch%': 'ia32',
46 }, { 46 }, {
47 'host_arch%': '<!pymod_do_main(detect_host_arch)', 47 'host_arch%': '<!pymod_do_main(detect_host_arch)',
48 }], 48 }],
49 ], 49 ],
50 }, 50 },
51 # Copy conditionally-set variables out one scope. 51 # Copy conditionally-set variables out one scope.
52 'chromeos%': '<(chromeos)', 52 'chromeos%': '<(chromeos)',
53 'chromecast%': '<(chromecast)', 53 'chromecast%': '<(chromecast)',
54 'use_aura%': '<(use_aura)', 54 'use_aura%': '<(use_aura)',
(...skipping 5802 matching lines...) Expand 10 before | Expand all | Expand 10 after
5857 # settings in target dicts. SYMROOT is a special case, because many other 5857 # settings in target dicts. SYMROOT is a special case, because many other
5858 # Xcode variables depend on it, including variables such as 5858 # Xcode variables depend on it, including variables such as
5859 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5859 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5860 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5860 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5861 # files to appear (when present) in the UI as actual files and not red 5861 # files to appear (when present) in the UI as actual files and not red
5862 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5862 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5863 # and therefore SYMROOT, needs to be set at the project level. 5863 # and therefore SYMROOT, needs to be set at the project level.
5864 'SYMROOT': '<(DEPTH)/xcodebuild', 5864 'SYMROOT': '<(DEPTH)/xcodebuild',
5865 }, 5865 },
5866 } 5866 }
OLDNEW
« no previous file with comments | « DEPS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698