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

Side by Side Diff: build/common.gypi

Issue 1503523002: Put back path to Android MIPS gnu as for clang (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 4208 matching lines...) Expand 10 before | Expand all | Expand 10 after
4219 }, { # clang==0 4219 }, { # clang==0
4220 'cflags': ['-mips32', '-Wa,-mips32', ], 4220 'cflags': ['-mips32', '-Wa,-mips32', ],
4221 }], 4221 }],
4222 ], 4222 ],
4223 }], 4223 }],
4224 ['clang==1', { 4224 ['clang==1', {
4225 'cflags!': [ 4225 'cflags!': [
4226 # Clang does not support the following options. 4226 # Clang does not support the following options.
4227 '-finline-limit=64', 4227 '-finline-limit=64',
4228 ], 4228 ],
4229 'cflags': [ 4229 # TODO(gordanac) Enable integrated-as.
4230 # TODO(gordanac) Enable integrated-as. 4230 'cflags': [ '-fno-integrated-as' ],
4231 '-no-integrated-as', 4231 'conditions': [
4232 ['OS=="android"', {
4233 'cflags': [
4234 # Else /usr/bin/as gets picked up.
4235 '-B<(android_toolchain)',
4236 ],
4237 }],
4232 ], 4238 ],
4233 }], 4239 }],
4234 ['clang==1 and OS=="android"', { 4240 ['clang==1 and OS=="android"', {
4235 'ldflags': [ 4241 'ldflags': [
4236 # Let clang find the ld in the NDK. 4242 # Let clang find the ld in the NDK.
4237 '--gcc-toolchain=<(android_toolchain)/..', 4243 '--gcc-toolchain=<(android_toolchain)/..',
4238 ], 4244 ],
4239 }], 4245 }],
4240 ['mips_dsp_rev==1', { 4246 ['mips_dsp_rev==1', {
4241 'cflags': ['-mdsp'], 4247 'cflags': ['-mdsp'],
(...skipping 2128 matching lines...) Expand 10 before | Expand all | Expand 10 after
6370 # settings in target dicts. SYMROOT is a special case, because many other 6376 # settings in target dicts. SYMROOT is a special case, because many other
6371 # Xcode variables depend on it, including variables such as 6377 # Xcode variables depend on it, including variables such as
6372 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 6378 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
6373 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 6379 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
6374 # files to appear (when present) in the UI as actual files and not red 6380 # files to appear (when present) in the UI as actual files and not red
6375 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 6381 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
6376 # and therefore SYMROOT, needs to be set at the project level. 6382 # and therefore SYMROOT, needs to be set at the project level.
6377 'SYMROOT': '<(DEPTH)/xcodebuild', 6383 'SYMROOT': '<(DEPTH)/xcodebuild',
6378 }, 6384 },
6379 } 6385 }
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