Switch the nop pnacl x86-64 IRT shim to the real one generated from IDL.

src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp

Index: src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp
diff --git a/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp b/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp
new file mode 100644
index 0000000000000000000000000000000000000000..eaf6582560d91010fa69bfe6e2e1fa4b26967348
--- /dev/null
+++ b/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp
@@ -0,0 +1,64 @@
+# Copyright (c) 2011 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be

[robertm, 2011/12/01 22:55:43]

let's move the gyp stuff to a different CL

[jvoung - send to chromium..., 2011/12/01 23:35:34]

Done.

+# found in the LICENSE file.
+
+# TODO(jvoung): Enable this in build/all.gyp when bug described below
+# is fixed.
+
+{
+  'includes': [
+    '../../../build/common.gypi',
+  ],
+  'conditions': [
+    # This library is only for x86-64 for now.
+    ['target_arch=="x64" or OS=="win"', {
+      'targets' : [
+        {
+          'target_name': 'shim_generated_source',
+          'type': 'none',
+          'actions' : [
+            {
+              'action_name': 'generate_shim_source',
+              'inputs': [
+                '<(DEPTH)/ppapi/generators/generator.py',
+              ],
+              'outputs': [
+                '<(INTERMEDIATE_DIR)/pnacl_shim.c',
+              ],
+              'action': [
+                '>(python_exe)',
+                '<@(_inputs)',
+                '--srcroot=<(DEPTH)/ppapi/api',
+                '--wnone',
+                '--pnacl',
+                '--pnaclshim=<@(_outputs)',
+              ],
+            },
+          ],
+        },
+        {
+          'target_name': 'pnacl_irt_shim_lib',
+          'type': 'none',
+          'variables': {
+            'nlib_target': 'libpnacl_irt_shim.a',
+            'build_glibc': 1,
+            'build_newlib': 1,
+            'sources': ['shim_entry.c',
+                        'shim_ppapi.c',
+# TODO(jvoung): This doesn't quite work yet -- gyp needs to know how
+# to include the generated C file in the list of sources, and we
+# need to explicitly list out the header dependencies (since we can't
+# run the generator during the first pass of gyp -- in gclient runhooks).
+# I.e., we can't run the "scan_sources.py" on the generated file during
+# gclient runhooks, since the generated file doesn't exist yet.
+                        '<(INTERMEDIATE_DIR)/pnacl_shim.c']
+          },
+          'dependencies': [
+            'shim_generated_source',
+            '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
+          ],
+        },
+      ],
+    }],
+  ],
+}