diff options
| author | yael.aharon@chromium.org <yael.aharon@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-30 14:15:36 +0000 |
|---|---|---|
| committer | yael.aharon@chromium.org <yael.aharon@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-30 14:15:36 +0000 |
| commit | c03fe7b62a35b59b71748414e29e03fe229373cc (patch) | |
| tree | ed1bfd383fbda9640a5ae20c50d2e7551299e64f /components | |
| parent | 1b8acdba23bba89eb14877c3964415eb0f3b8dfb (diff) | |
| download | chromium_src-c03fe7b62a35b59b71748414e29e03fe229373cc.zip chromium_src-c03fe7b62a35b59b71748414e29e03fe229373cc.tar.gz chromium_src-c03fe7b62a35b59b71748414e29e03fe229373cc.tar.bz2 | |
Move nacl_defines to build/nacl_defines.gypi.
Remove the definition of nacl_defines from chrome.gyp. This will allow including these defines in other gyp files which are not in the chrome layer.
This is part of an effort to componentize NaCl code.
BUG=244791
R=jam@chromium.org, mseaborn@chromium.org
Review URL: https://codereview.chromium.org/20550003
Patch from Yael Aharon <yael.aharon@intel.com>.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@214344 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components')
| -rw-r--r-- | components/nacl/nacl_defines.gypi | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/components/nacl/nacl_defines.gypi b/components/nacl/nacl_defines.gypi new file mode 100644 index 0000000..e00abaa --- /dev/null +++ b/components/nacl/nacl_defines.gypi @@ -0,0 +1,61 @@ +# Copyright 2013 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +{ + 'variables': { + 'conditions': [ + ['OS=="win"', { + 'nacl_defines': [ + 'NACL_WINDOWS=1', + 'NACL_LINUX=0', + 'NACL_OSX=0', + ], + }], + ['OS=="linux"', { + 'nacl_defines': [ + 'NACL_WINDOWS=0', + 'NACL_LINUX=1', + 'NACL_OSX=0', + ], + }], + ['OS=="mac"', { + 'nacl_defines': [ + 'NACL_WINDOWS=0', + 'NACL_LINUX=0', + 'NACL_OSX=1', + ], + }], + # TODO(mcgrathr): This duplicates native_client/build/common.gypi; + # we should figure out a way to unify the settings. + ['target_arch=="ia32"', { + 'nacl_defines': [ + 'NACL_TARGET_SUBARCH=32', + 'NACL_TARGET_ARCH=x86', + 'NACL_BUILD_SUBARCH=32', + 'NACL_BUILD_ARCH=x86', + ], + }], + ['target_arch=="x64"', { + 'nacl_defines': [ + 'NACL_TARGET_SUBARCH=64', + 'NACL_TARGET_ARCH=x86', + 'NACL_BUILD_SUBARCH=64', + 'NACL_BUILD_ARCH=x86', + ], + }], + ['target_arch=="arm"', { + 'nacl_defines': [ + 'NACL_BUILD_ARCH=arm', + 'NACL_BUILD_SUBARCH=32', + 'NACL_TARGET_ARCH=arm', + 'NACL_TARGET_SUBARCH=32', + ], + }], + ['target_arch=="mipsel"', { + 'nacl_defines': [ + ], + }], + ], + } +} |