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

Side by Side Diff: components/nacl/nacl_defines.gypi

Issue 199583008: Enable Arm64 target arch in gyp build config (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix skia.gyp too. Created 6 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 | « build/java_apk.gypi ('k') | skia/skia.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 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 { 5 {
6 'variables': { 6 'variables': {
7 'conditions': [ 7 'conditions': [
8 ['OS=="win"', { 8 ['OS=="win"', {
9 'nacl_defines': [ 9 'nacl_defines': [
10 'NACL_WINDOWS=1', 10 'NACL_WINDOWS=1',
11 'NACL_LINUX=0', 11 'NACL_LINUX=0',
12 'NACL_OSX=0', 12 'NACL_OSX=0',
13 ], 13 ],
14 }], 14 }],
15 ['OS=="linux"', { 15 ['OS=="linux"', {
16 'nacl_defines': [ 16 'nacl_defines': [
17 'NACL_WINDOWS=0', 17 'NACL_WINDOWS=0',
18 'NACL_LINUX=1', 18 'NACL_LINUX=1',
19 'NACL_OSX=0', 19 'NACL_OSX=0',
20 ], 20 ],
21 }], 21 }],
22 ['OS=="mac"', { 22 ['OS=="mac"', {
23 'nacl_defines': [ 23 'nacl_defines': [
24 'NACL_WINDOWS=0', 24 'NACL_WINDOWS=0',
25 'NACL_LINUX=0', 25 'NACL_LINUX=0',
26 'NACL_OSX=1', 26 'NACL_OSX=1',
27 ], 27 ],
28 }], 28 }],
29 # "disabled_nacl" is always set to "1" when building for "ios", so 29 # "disabled_nacl" is always set to "1" when building for "ios" or android,
30 # set "nacl_defines" to the empty list to ensure the variable is 30 # so set "nacl_defines" to the empty list to ensure the variable is
31 # always defined. 31 # always defined.
32 ['OS=="ios"', { 32 ['OS=="ios" or OS=="android"', {
33 'nacl_defines': [ 33 'nacl_defines': [
34 ], 34 ],
35 }], 35 }],
36 # TODO(mcgrathr): This duplicates native_client/build/common.gypi; 36 # TODO(mcgrathr): This duplicates native_client/build/common.gypi;
37 # we should figure out a way to unify the settings. 37 # we should figure out a way to unify the settings.
38 ['target_arch=="ia32"', { 38 ['target_arch=="ia32"', {
39 'nacl_defines': [ 39 'nacl_defines': [
40 'NACL_TARGET_SUBARCH=32', 40 'NACL_TARGET_SUBARCH=32',
41 'NACL_TARGET_ARCH=x86', 41 'NACL_TARGET_ARCH=x86',
42 'NACL_BUILD_SUBARCH=32', 42 'NACL_BUILD_SUBARCH=32',
(...skipping 20 matching lines...) Expand all
63 'nacl_defines': [ 63 'nacl_defines': [
64 'NACL_BUILD_ARCH=mips', 64 'NACL_BUILD_ARCH=mips',
65 'NACL_BUILD_SUBARCH=32', 65 'NACL_BUILD_SUBARCH=32',
66 'NACL_TARGET_ARCH=mips', 66 'NACL_TARGET_ARCH=mips',
67 'NACL_TARGET_SUBARCH=32', 67 'NACL_TARGET_SUBARCH=32',
68 ], 68 ],
69 }], 69 }],
70 ], 70 ],
71 } 71 }
72 } 72 }
OLDNEW
« no previous file with comments | « build/java_apk.gypi ('k') | skia/skia.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698