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

Side by Side Diff: build/common_untrusted.gypi

Issue 452543002: Build only the appropriate x86 arches for nacl (chrome side). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix more Created 6 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 | ppapi/native_client/native_client.gyp » ('j') | 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 'conditions': [ 12 'conditions': [
13 # TODO(bradnelson): Drop this once the nacl side does the same.
14 ['target_arch=="x64"', {
15 'variables': {
16 'enable_x86_32': 0,
17 },
18 }],
19 ['target_arch=="ia32" and OS!="win"', {
20 'variables': {
21 'enable_x86_64': 0,
22 },
23 }],
13 ['target_arch=="arm"', { 24 ['target_arch=="arm"', {
14 'variables': { 25 'variables': {
15 'clang': 1, 26 'clang': 1,
16 }, 27 },
17 'defines': [ 28 'defines': [
18 # Needed by build/build_config.h processor architecture detection. 29 # Needed by build/build_config.h processor architecture detection.
19 '__ARMEL__', 30 '__ARMEL__',
20 # Needed by base/third_party/nspr/prtime.cc. 31 # Needed by base/third_party/nspr/prtime.cc.
21 '__arm__', 32 '__arm__',
22 # Disable ValGrind. The assembly code it generates causes the build 33 # Disable ValGrind. The assembly code it generates causes the build
23 # to fail. 34 # to fail.
24 'NVALGRIND', 35 'NVALGRIND',
25 ], 36 ],
26 }], 37 }],
27 ], 38 ],
28 }, 39 },
29 } 40 }
OLDNEW
« no previous file with comments | « no previous file | ppapi/native_client/native_client.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698