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

Side by Side Diff: build/common_untrusted.gypi

Issue 10912010: Fix the untrusted builds of Chrome on ARM. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 3 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 | « 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 # This GYP file should be included for every target in Chromium that is built 5 # This GYP file should be included for every target in Chromium that is built
6 # using the NaCl toolchain. 6 # using the NaCl toolchain.
7 { 7 {
8 'includes': [ 8 'includes': [
9 '../native_client/build/untrusted.gypi', 9 '../native_client/build/untrusted.gypi',
10 ], 10 ],
11 'target_defaults': { 11 'target_defaults': {
12 'variables': { 12 'variables': {
13 'conditions': [ 13 'conditions': [
14 ['target_arch=="arm"', { 14 ['target_arch=="arm"', {
15 'clang': 1, 15 'clang': 1,
16 'defines': [ 16 'defines': [
17 # Needed by build/build_config.h processor architecture detection. 17 # Needed by build/build_config.h processor architecture detection.
18 '__ARMEL__', 18 '__ARMEL__',
19 # Needed by base/third_party/nspr/prtime.cc. 19 # Needed by base/third_party/nspr/prtime.cc.
20 '__arm__', 20 '__arm__',
21 # Disable ValGrind. The assembly code it generates causes the build 21 # Disable ValGrind. The assembly code it generates causes the build
22 # to fail. 22 # to fail.
23 'NVALGRIND', 23 'NVALGRIND',
24 ], 24 ],
25 'compile_flags': [
26 # Disable C++ 11 extensions. Chrome's OVERRIDE macro will generate
27 # warnings that cause the build to fail.
28 '-Wno-c++11-extensions',
29 ],
25 }], 30 }],
26 ], 31 ],
27 }, 32 },
28 }, 33 },
29 } 34 }
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