Speculative Revert 108361 - in hope to fix Win Builder 2010

http://build.chromium.org/p/chromium/builders/Win%20Builder%202010%20%28dbg%29/builds/12897


This CL is based on the patch:
   http://codereview.chromium.org/8416025

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.

This broke the mac build due to a missing dependency where pthread.h was
unavailable.  This header gets copied to the correct location during the
prep_toolchain action.  I've added the appropriate dependency shown bellow
to the original patch.

This add the addition dependency to ppruntime
      'dependencies': [
        '<(DEPTH)/native_client/src/tools.gyp:prep_toolchain'
      ],

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

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

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

2 files changed, 0 insertions, 153 deletions

diff --git a/ppapi/native_client/native_client.gyp b/ppapi/native_client/native_client.gyp
deleted file mode 100644
index fa51ee2..0000000
--- a/ppapi/native_client/native_client.gyp
+++ /dev/null
@@ -1,59 +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.
-
-{
-  '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',
-          ],
-        },
-      ],
-    }],
-  ],
-}
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy.gyp b/ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy.gyp
index 26ff85e..b071b0a 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy.gyp
+++ b/ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy.gyp
@@ -68,99 +68,5 @@
         '<(DEPTH)/ppapi/ppapi.gyp:ppapi_c',
       ],
     },
-    {
-      'target_name': 'ppruntime_lib',
-      'type': 'none',
-      'dependencies': [
-        '<(DEPTH)/native_client/tools.gyp:prep_toolchain'
-      ],
-      'variables': {
-        'nlib_target': 'libppruntime.a',
-        'build_glibc': 0,
-        'build_newlib': 1,
-        'include_dirs': [
-          '<(DEPTH)/gpu',
-          '<(DEPTH)/ppapi/native_client/src/shared/ppapi_proxy/untrusted',
-        ],
-        'sources': [
-          '<(DEPTH)/gpu/command_buffer/common/cmd_buffer_common.cc',
-          '<(DEPTH)/gpu/command_buffer/common/gles2_cmd_format.cc',
-          '<(DEPTH)/gpu/command_buffer/common/gles2_cmd_utils.cc',
-          '<(DEPTH)/gpu/command_buffer/common/logging.cc',
-
-          '<(DEPTH)/gpu/command_buffer/client/cmd_buffer_helper.cc',
-          '<(DEPTH)/gpu/command_buffer/client/fenced_allocator.cc',
-          '<(DEPTH)/gpu/command_buffer/client/gles2_c_lib.cc',
-          '<(DEPTH)/gpu/command_buffer/client/gles2_cmd_helper.cc',
-          '<(DEPTH)/gpu/command_buffer/client/gles2_implementation.cc',
-          '<(DEPTH)/gpu/command_buffer/client/program_info_manager.cc',
-          '<(DEPTH)/gpu/command_buffer/client/gles2_lib.cc',
-          '<(DEPTH)/gpu/command_buffer/client/mapped_memory.cc',
-          '<(DEPTH)/gpu/command_buffer/client/ring_buffer.cc',
-          '<(DEPTH)/gpu/command_buffer/common/id_allocator.cc',
-
-          'command_buffer_nacl.cc',
-          'input_event_data.cc',
-          'object_serialize.cc',
-          'plugin_callback.cc',
-          'plugin_globals.cc',
-          'plugin_instance_data.cc',
-          'plugin_main.cc',
-          'plugin_nacl_file.cc',
-          'plugin_opengles.cc',
-          'plugin_ppb.cc',
-          'plugin_ppb_audio.cc',
-          'plugin_ppb_audio_config.cc',
-          'plugin_ppb_buffer.cc',
-          'plugin_ppb_core.cc',
-          'plugin_ppb_cursor_control.cc',
-          'plugin_ppb_file_io.cc',
-          'plugin_ppb_file_system.cc',
-          'plugin_ppb_file_ref.cc',
-          'plugin_ppb_find.cc',
-          'plugin_ppb_font.cc',
-          'plugin_ppb_fullscreen.cc',
-          'plugin_ppb_graphics_2d.cc',
-          'plugin_ppb_graphics_3d.cc',
-          'plugin_ppb_image_data.cc',
-          'plugin_ppb_input_event.cc',
-          'plugin_ppb_instance.cc',
-          'plugin_ppb_memory.cc',
-          'plugin_ppb_messaging.cc',
-          'plugin_ppb_mouse_lock.cc',
-          'plugin_ppb_pdf.cc',
-          'plugin_ppb_scrollbar.cc',
-          'plugin_ppb_testing.cc',
-          'plugin_ppb_url_loader.cc',
-          'plugin_ppb_url_request_info.cc',
-          'plugin_ppb_url_response_info.cc',
-          'plugin_ppb_var.cc',
-          'plugin_ppb_widget.cc',
-          'plugin_ppb_zoom.cc',
-          'plugin_ppp_find_rpc_server.cc',
-          'plugin_ppp_input_event_rpc_server.cc',
-          'plugin_ppp_instance_rpc_server.cc',
-          'plugin_ppp_messaging_rpc_server.cc',
-          'plugin_ppp_mouse_lock_rpc_server.cc',
-          'plugin_ppp_printing_rpc_server.cc',
-          'plugin_ppp_scrollbar_rpc_server.cc',
-          'plugin_ppp_selection_rpc_server.cc',
-          'plugin_ppp_widget_rpc_server.cc',
-          'plugin_ppp_zoom_rpc_server.cc',
-          'plugin_ppp_rpc_server.cc',
-          'plugin_resource.cc',
-          'plugin_resource_tracker.cc',
-          'plugin_threading.cc',
-          'plugin_upcall.cc',
-          'proxy_var.cc',
-          'proxy_var_cache.cc',
-          'utility.cc',
-          # Autogenerated files
-          'ppp_rpc_server.cc',
-          'ppb_rpc_client.cc',
-          'upcall_client.cc'
-        ],
-      },
-    },
   ],
 }