Split the PNaCl IRT shim into 3 pieces, and include one piece into IRT.

ppapi/generators/idl_gen_pnacl.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """Generator for Pnacl Shim functions that bridges the calling conventions
 between GCC and PNaCl.  """
 
 from datetime import datetime
 import difflib
@@ skipping 30 matching lines @@
                         'pnacl',
                         'Generate the PNaCl shim.')
     self.cgen = CGen()
     self._skip_opt = False
 
   ############################################################
 
   def OwnHeaderFile(self):
     """Return the header file that specifies the API of this wrapper.
     We do not generate the header files.  """
-    return 'ppapi/generators/pnacl_shim.h'
+    return 'ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.h'
 
 
   def InterfaceVersionNeedsWrapping(self, iface, version):
     """Return true if the interface+version has ANY methods that
     need wrapping.
     """
     if self._skip_opt:
       return True
     if iface.GetName().endswith('Trusted'):
       return False
@@ skipping 207 matching lines @@
     return TestFiles(filenames, test_releases)
 
   # Otherwise, generate the output file (for potential use as golden file).
   ast = ParseFiles(filenames)
   return pnaclgen.GenerateRange(ast, test_releases, filenames)
 
 
 if __name__ == '__main__':
   retval = Main(sys.argv[1:])
   sys.exit(retval)