| 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 ['OS=="win"', { |
| 9 'nacl_defines': [ |
| 10 'NACL_WINDOWS=1', |
| 11 'NACL_LINUX=0', |
| 12 'NACL_OSX=0', |
| 13 ], |
| 14 }], |
| 15 ['OS=="linux"', { |
| 16 'nacl_defines': [ |
| 17 'NACL_WINDOWS=0', |
| 18 'NACL_LINUX=1', |
| 19 'NACL_OSX=0', |
| 20 ], |
| 21 }], |
| 22 ['OS=="mac"', { |
| 23 'nacl_defines': [ |
| 24 'NACL_WINDOWS=0', |
| 25 'NACL_LINUX=0', |
| 26 'NACL_OSX=1', |
| 27 ], |
| 28 }], |
| 29 # TODO(mcgrathr): This duplicates native_client/build/common.gypi; |
| 30 # we should figure out a way to unify the settings. |
| 31 ['target_arch=="ia32"', { |
| 32 'nacl_defines': [ |
| 33 'NACL_TARGET_SUBARCH=32', |
| 34 'NACL_TARGET_ARCH=x86', |
| 35 'NACL_BUILD_SUBARCH=32', |
| 36 'NACL_BUILD_ARCH=x86', |
| 37 ], |
| 38 }], |
| 39 ['target_arch=="x64"', { |
| 40 'nacl_defines': [ |
| 41 'NACL_TARGET_SUBARCH=64', |
| 42 'NACL_TARGET_ARCH=x86', |
| 43 'NACL_BUILD_SUBARCH=64', |
| 44 'NACL_BUILD_ARCH=x86', |
| 45 ], |
| 46 }], |
| 47 ['target_arch=="arm"', { |
| 48 'nacl_defines': [ |
| 49 'NACL_BUILD_ARCH=arm', |
| 50 'NACL_BUILD_SUBARCH=32', |
| 51 'NACL_TARGET_ARCH=arm', |
| 52 'NACL_TARGET_SUBARCH=32', |
| 53 ], |
| 54 }], |
| 55 ['target_arch=="mipsel"', { |
| 56 'nacl_defines': [ |
| 57 ], |
| 58 }], |
| 59 ], |
| 60 } |
| 61 } |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 20550003:
Move nacl_defines to build.common.gypi. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master