Pulling new nacl into chrome, which now uses a single ppapi copy.

chrome/build_nacl_irt.py

 #!/usr/bin/python
 # 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.
 
 import optparse
 import os
 import re
 import shutil
 import subprocess
 import sys
 
 
 # Where things are in relation to this script.
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
 SRC_DIR = os.path.dirname(SCRIPT_DIR)
 NACL_DIR = os.path.join(SRC_DIR, 'native_client')
 
 # Pathing to the two command_buffer directories (relative to native_client).
 NACL_CMD_BUFFER_DIR = os.path.join('src', 'shared',
                                    'ppapi_proxy', 'command_buffer')
 GPU_CMD_BUFFER_DIR = os.path.join('..', 'gpu', 'command_buffer')
 
+# Pathing to mirror of nacl tree in ppapi.
+PPAPI_NACL_DIR = os.path.join(SRC_DIR, 'ppapi', 'native_client')
+
 
 def RelativePath(path, base):
   """Find the relative path.
 
   Arguments:
     path: path we want a relative path to.
     base: path we want a relative path from.
   Returns:
     The relative path from base to path.
   """
@@ skipping 53 matching lines @@
       filename = m.group(1)
       if '[' in filename:
         continue
       if filename.startswith('scons-out'):
         continue
       if filename.endswith('.nexe'):
         continue
       # Apply the underlay of gpu/command_buffer (to match scons).
       if filename.startswith(NACL_CMD_BUFFER_DIR + os.sep):
         filename = GPU_CMD_BUFFER_DIR + filename[len(NACL_CMD_BUFFER_DIR):]
+      # Apply the underlay of ppapi (to match scons).
+      if (not os.path.exists(os.path.join(NACL_DIR, filename)) and
+          os.path.exists(os.path.join(PPAPI_NACL_DIR, filename))):
+        filename = '../ppapi/native_client/' + filename
       inputs.add(filename)
   # Check that everything exists and make it script relative.
   # Exclude things above SRC_DIR.
   rel_inputs = set()
   for f in inputs:
     nf = os.path.join(NACL_DIR, f)
     if not os.path.exists(nf):
       raise Exception('missing input file "%s"' % nf)
     # If the relative path from SRC_DIR to the file starts with ../ ignore it.
     # (i.e. the file is outside the client).
@@ skipping 87 matching lines @@
     sys.exit(1)
 
   if options.inputs:
     PrintInputs(options.platforms)
   else:
     BuildIRT(options.platforms, options.outdir)
 
 
 if __name__ == '__main__':
   Main(sys.argv)