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

Unified Diff: components/nacl/nacl_defines.gypi

Issue 912503003: Remove "nacl_defines" from the GYP build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 | « components/nacl.gyp ('k') | mojo/mojo_nacl.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/nacl/nacl_defines.gypi
diff --git a/components/nacl/nacl_defines.gypi b/components/nacl/nacl_defines.gypi
deleted file mode 100644
index 270c84c8ad3962ae556bde6aaf3668af8e9a3ddd..0000000000000000000000000000000000000000
--- a/components/nacl/nacl_defines.gypi
+++ /dev/null
@@ -1,75 +0,0 @@
-# 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': [
- ['disable_nacl==1', {
- 'nacl_defines': [
- ],
- }, {
- 'conditions': [
- ['OS=="win"', {
- 'nacl_defines': [
- 'NACL_WINDOWS=1',
- 'NACL_LINUX=0',
- 'NACL_OSX=0',
- 'NACL_ANDROID=0',
- ],
- }],
- ['OS=="linux"', {
- 'nacl_defines': [
- 'NACL_WINDOWS=0',
- 'NACL_LINUX=1',
- 'NACL_OSX=0',
- 'NACL_ANDROID=0',
- ],
- }],
- ['OS=="mac"', {
- 'nacl_defines': [
- 'NACL_WINDOWS=0',
- 'NACL_LINUX=0',
- 'NACL_OSX=1',
- 'NACL_ANDROID=0',
- ],
- }],
- ['OS=="android"', {
- 'nacl_defines': [
- 'NACL_WINDOWS=0',
- 'NACL_LINUX=1',
- 'NACL_OSX=0',
- 'NACL_ANDROID=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_BUILD_SUBARCH=32',
- 'NACL_BUILD_ARCH=x86',
- ],
- }],
- ['target_arch=="x64"', {
- 'nacl_defines': [
- 'NACL_BUILD_SUBARCH=64',
- 'NACL_BUILD_ARCH=x86',
- ],
- }],
- ['target_arch=="arm"', {
- 'nacl_defines': [
- 'NACL_BUILD_ARCH=arm',
- 'NACL_BUILD_SUBARCH=32',
- ],
- }],
- ['target_arch=="mipsel"', {
- 'nacl_defines': [
- 'NACL_BUILD_ARCH=mips',
- 'NACL_BUILD_SUBARCH=32',
- ],
- }],
- ],
- }
-}
« no previous file with comments | « components/nacl.gyp ('k') | mojo/mojo_nacl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698