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

Unified Diff: build/nacl_defines.gypi

Issue 20550003: Move nacl_defines to build.common.gypi. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/chrome.gyp » ('j') | chrome/chrome.gyp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/nacl_defines.gypi
diff --git a/build/nacl_defines.gypi b/build/nacl_defines.gypi
new file mode 100644
index 0000000000000000000000000000000000000000..3887794f3421b3d12e29c37745624c5addbeefb3
--- /dev/null
+++ b/build/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.
+
+{
Mark Seaborn 2013/07/28 00:41:07 Should this file go in components/nacl, to keep th
+ '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': [
+ ],
+ }],
+ ],
+ }
+}
« no previous file with comments | « no previous file | chrome/chrome.gyp » ('j') | chrome/chrome.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698