diff options
| author | teravest <teravest@chromium.org> | 2015-02-09 14:26:04 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-09 22:26:43 +0000 |
| commit | 2b59c805e1e097e10c36650573fa5c47cd47dc03 (patch) | |
| tree | c09f0437a829b6a75af5ed427507065fc28261df /components | |
| parent | 8961793ed9860cd8c66a58902bbeaa0a6aee9ca3 (diff) | |
| download | chromium_src-2b59c805e1e097e10c36650573fa5c47cd47dc03.zip chromium_src-2b59c805e1e097e10c36650573fa5c47cd47dc03.tar.gz chromium_src-2b59c805e1e097e10c36650573fa5c47cd47dc03.tar.bz2 | |
Remove "nacl_defines" from the GN build.
The following NaCl-related defines are now provided by
native_client/src/include/build_config.h instead of the build system:
NACL_WINDOWS
NACL_LINUX
NACL_OSX
NACL_ANDROID
NACL_BUILD_ARCH
NACL_BUILD_SUBARCH
This change removes these definitions from gn(i) files, as they no longer need
to be provided by the build system.
BUG=440012
Review URL: https://codereview.chromium.org/908003002
Cr-Commit-Position: refs/heads/master@{#315408}
Diffstat (limited to 'components')
| -rw-r--r-- | components/nacl/nacl_defines.gni | 58 |
1 files changed, 0 insertions, 58 deletions
diff --git a/components/nacl/nacl_defines.gni b/components/nacl/nacl_defines.gni deleted file mode 100644 index 8d69b16..0000000 --- a/components/nacl/nacl_defines.gni +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 2014 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. - -nacl_defines = [] -if (is_win) { - nacl_defines += [ - "NACL_WINDOWS=1", - "NACL_LINUX=0", - "NACL_OSX=0", - "NACL_ANDROID=0", - ] -} else if (is_linux) { - nacl_defines += [ - "NACL_WINDOWS=0", - "NACL_LINUX=1", - "NACL_OSX=0", - "NACL_ANDROID=0", - ] -} else if (is_mac) { - nacl_defines += [ - "NACL_WINDOWS=0", - "NACL_LINUX=0", - "NACL_OSX=1", - "NACL_ANDROID=0", - ] -} - -if (is_android) { - nacl_defines += [ - "NACL_WINDOWS=0", - "NACL_LINUX=1", - "NACL_OSX=0", - "NACL_ANDROID=1", - ] -} - -if (cpu_arch == "x86") { - nacl_defines += [ - "NACL_BUILD_SUBARCH=32", - "NACL_BUILD_ARCH=x86", - ] -} else if (cpu_arch == "x64") { - nacl_defines += [ - "NACL_BUILD_SUBARCH=64", - "NACL_BUILD_ARCH=x86", - ] -} else if (cpu_arch == "arm") { - nacl_defines += [ - "NACL_BUILD_ARCH=arm", - "NACL_BUILD_SUBARCH=32", - ] -} else if (cpu_arch == "mipsel") { - nacl_defines += [ - "NACL_BUILD_ARCH=mips", - "NACL_BUILD_SUBARCH=32", - ] -} |