Revert 108116 - Use GYP to build nacl_irt

Converts Chrome from using scons to using GYP when building nacl_irt.
This change causes chrome to use GYP based components for untrusted
code.  As a benifit, GYP will no longer need to run and scrape scons
output to determine irt dependencies.  This also allows us to avoid
invoking scons during the build process.
We roll NaCl deps to get a fix for a simultaneous 32/64 bit build
issue on Windows.

TEST= try
BUG= http://code.google.com/p/chromium/issues/detail?id=96782
Review URL: http://codereview.chromium.org/8416025

TBR=noelallen@google.com
Review URL: http://codereview.chromium.org/8440003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108119 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 0 insertions, 62 deletions

diff --git a/ppapi/native_client/native_client.gyp b/ppapi/native_client/native_client.gyp
deleted file mode 100644
index 01f8527..0000000
--- a/ppapi/native_client/native_client.gyp
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright (c) 2011 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': {
-    'disable_untrusted%': 0
-  },
-  'includes': [
-    '../../native_client/build/untrusted.gypi',
-  ],
-  'conditions': [
-    ['disable_nacl!=1', {
-      'targets': [
-        {
-          'target_name': 'nacl_irt',
-          'type': 'none',
-          'variables': {
-            'nexe_target': 'nacl_irt',
-            'out64': '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
-            'out32': '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
-            'build_glibc': 0,
-            'build_newlib': 1,
-            'include_dirs': [
-              'lib/gl/include',
-              '..',
-            ],
-            'link_flags': [
-              '-lirt_browser',
-              '-lppruntime',
-              '-lsrpc',
-              '-limc_syscalls',
-              '-lplatform',
-              '-lgio',
-              '-lm',
-            ],
-            'sources': [
-            ],
-          },
-          'conditions': [
-            ['target_arch=="x64" or target_arch == "ia32"', {
-              'variables': {
-                'link_flags': [
-                  '-Wl,--section-start,.rodata=0x3ef00000',
-                  '-Wl,-Ttext-segment=0x0fc00000',
-                ],
-              },
-            }],
-          ],
-          'dependencies': [
-            'src/shared/ppapi_proxy/ppapi_proxy.gyp:ppruntime_lib',
-            '../../native_client/src/untrusted/irt/irt.gyp:irt_browser_lib',
-            '../../native_client/src/shared/srpc/srpc.gyp:srpc_lib',
-            '../../native_client/src/shared/platform/platform.gyp:platform_lib',
-            '../../native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib',
-            '../../native_client/src/shared/gio/gio.gyp:gio_lib',
-          ],
-        },
-      ],
-    }],
-  ],
-}