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

Side by Side Diff: build/common.gypi

Issue 1021513002: Build 64-bit binaries by default when compiling for iOS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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) 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 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 241
242 # Set default gomadir. 242 # Set default gomadir.
243 ['OS=="win"', { 243 ['OS=="win"', {
244 'gomadir': 'c:\\goma\\goma-win', 244 'gomadir': 'c:\\goma\\goma-win',
245 }, { 245 }, {
246 'gomadir': '<!(/bin/echo -n ${HOME}/goma)', 246 'gomadir': '<!(/bin/echo -n ${HOME}/goma)',
247 }], 247 }],
248 248
249 # Set the default "target_subarch" on iOS. Valid values are "arm32", 249 # Set the default "target_subarch" on iOS. Valid values are "arm32",
250 # "arm64" and "both" (meaning a fat binary). 250 # "arm64" and "both" (meaning a fat binary).
251 #
252 # TODO(sdefresne): change the default from "arm32" to "both" for
253 # "target_subarch" once http://crbug.com/339477 is fixed.
254 #
255 # TODO(sdefresne): set the "target_arch" to "arm" once compilation
256 # of skia has been fixed for simulator. http://crbug.com/342377
257 ['OS=="ios"', { 251 ['OS=="ios"', {
258 'target_subarch%': 'arm32', 252 'target_subarch%': 'arm64',
259 }], 253 }],
260 254
261 # Set arch variants for MIPS platforms. 255 # Set arch variants for MIPS platforms.
262 ['target_arch=="mips64el"', { 256 ['target_arch=="mips64el"', {
263 'conditions': [ 257 'conditions': [
264 ['OS=="android"', { 258 ['OS=="android"', {
265 'mips_arch_variant%': 'r6', 259 'mips_arch_variant%': 'r6',
266 }, { 260 }, {
267 'mips_arch_variant%': 'r2', 261 'mips_arch_variant%': 'r2',
268 }], 262 }],
(...skipping 5754 matching lines...) Expand 10 before | Expand all | Expand 10 after
6023 # settings in target dicts. SYMROOT is a special case, because many other 6017 # settings in target dicts. SYMROOT is a special case, because many other
6024 # Xcode variables depend on it, including variables such as 6018 # Xcode variables depend on it, including variables such as
6025 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 6019 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
6026 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 6020 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
6027 # files to appear (when present) in the UI as actual files and not red 6021 # files to appear (when present) in the UI as actual files and not red
6028 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 6022 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
6029 # and therefore SYMROOT, needs to be set at the project level. 6023 # and therefore SYMROOT, needs to be set at the project level.
6030 'SYMROOT': '<(DEPTH)/xcodebuild', 6024 'SYMROOT': '<(DEPTH)/xcodebuild',
6031 }, 6025 },
6032 } 6026 }
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