| OLD | NEW |
|---|
| (Empty) |
| 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 | |
| 3 # found in the LICENSE file. | |
| 4 | |
| 5 { | |
| 6 'variables': { | |
| 7 'conditions': [ | |
| 8 ['disable_nacl==1', { | |
| 9 'nacl_defines': [ | |
| 10 ], | |
| 11 }, { | |
| 12 'conditions': [ | |
| 13 ['OS=="win"', { | |
| 14 'nacl_defines': [ | |
| 15 'NACL_WINDOWS=1', | |
| 16 'NACL_LINUX=0', | |
| 17 'NACL_OSX=0', | |
| 18 'NACL_ANDROID=0', | |
| 19 ], | |
| 20 }], | |
| 21 ['OS=="linux"', { | |
| 22 'nacl_defines': [ | |
| 23 'NACL_WINDOWS=0', | |
| 24 'NACL_LINUX=1', | |
| 25 'NACL_OSX=0', | |
| 26 'NACL_ANDROID=0', | |
| 27 ], | |
| 28 }], | |
| 29 ['OS=="mac"', { | |
| 30 'nacl_defines': [ | |
| 31 'NACL_WINDOWS=0', | |
| 32 'NACL_LINUX=0', | |
| 33 'NACL_OSX=1', | |
| 34 'NACL_ANDROID=0', | |
| 35 ], | |
| 36 }], | |
| 37 ['OS=="android"', { | |
| 38 'nacl_defines': [ | |
| 39 'NACL_WINDOWS=0', | |
| 40 'NACL_LINUX=1', | |
| 41 'NACL_OSX=0', | |
| 42 'NACL_ANDROID=1', | |
| 43 ], | |
| 44 }], | |
| 45 ], | |
| 46 }], | |
| 47 # TODO(mcgrathr): This duplicates native_client/build/common.gypi; | |
| 48 # we should figure out a way to unify the settings. | |
| 49 ['target_arch=="ia32"', { | |
| 50 'nacl_defines': [ | |
| 51 'NACL_BUILD_SUBARCH=32', | |
| 52 'NACL_BUILD_ARCH=x86', | |
| 53 ], | |
| 54 }], | |
| 55 ['target_arch=="x64"', { | |
| 56 'nacl_defines': [ | |
| 57 'NACL_BUILD_SUBARCH=64', | |
| 58 'NACL_BUILD_ARCH=x86', | |
| 59 ], | |
| 60 }], | |
| 61 ['target_arch=="arm"', { | |
| 62 'nacl_defines': [ | |
| 63 'NACL_BUILD_ARCH=arm', | |
| 64 'NACL_BUILD_SUBARCH=32', | |
| 65 ], | |
| 66 }], | |
| 67 ['target_arch=="mipsel"', { | |
| 68 'nacl_defines': [ | |
| 69 'NACL_BUILD_ARCH=mips', | |
| 70 'NACL_BUILD_SUBARCH=32', | |
| 71 ], | |
| 72 }], | |
| 73 ], | |
| 74 } | |
| 75 } | |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 912503003:
Remove "nacl_defines" from the GYP build. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master