Switching ppapi on nacl side to import chrome side .gyp[i] directly.

src/shared/ppapi/build.scons

 # -*- python -*-
 # Copyright 2010 The Native Client Authors.  All rights reserved.
 # Use of this source code is governed by a BSD-style license that can
 # be found in the LICENSE file.
 
 # The source files (.cc and .h) listed in this file are maintained by the
 # script ./update-scons.py.  Update $SOURCE_ROOT/ppapi and run the script
 # ./update-scons.py to update all of the source files listed here.
 
 # update-scons.py reads the .scons files in this directory.  It replaces all
 # of the lines between the starting marker and the ending marker with the
 # corresponding list of files from the given gyp file.
 #
 # The starting marker format is:
 #   # From GYP_FILE_NAME:TARGET:REGEXP

[Mark Seaborn, 2011/03/22 01:17:27]

This comment would need to be removed.

[bradn, 2011/03/22 01:51:43]

Done.

 # The ending marker format is:
 #   # End GYP_FILE_NAME
 #
 # For example, if this exists in the .scons file:
 #   # From ppapi.gyp:ppapi_c:.*\.h
 #   ...
 #   # End ppapi.gyp
 #
 # then this script will remove all of the lines between the starting marker and
 # the ending marker.  It will then find the 'ppapi_c' target in the ppapi.gyp
 # file.  It will find all 'sources' for that target that match the regular
 # expression '.*\.h' and will insert each of those source files in between the
 # two markers.
 
 Import('env')
 
 # Underlay $SOURCE_ROOT/ppapi in this directory.
 Dir('.').addRepository(Dir('#/../ppapi'))
 
 # Don't treat warnings as errors on Windows
 if env.Bit('windows'):
   env.FilterOut(CCFLAGS=['/WX'])
 
-cpp_sources = [
-    # Updated automatically by update-scons.py.
-    # From ppapi_cpp.gypi:ppapi_cpp_objects:.*\.cc
-    'cpp/audio.cc',
-    'cpp/audio_config.cc',
-    'cpp/core.cc',
-    'cpp/graphics_2d.cc',
-    'cpp/image_data.cc',
-    'cpp/instance.cc',
-    'cpp/module.cc',
-    'cpp/paint_aggregator.cc',
-    'cpp/paint_manager.cc',
-    'cpp/rect.cc',
-    'cpp/resource.cc',
-    'cpp/url_loader.cc',
-    'cpp/url_request_info.cc',
-    'cpp/url_response_info.cc',
-    'cpp/var.cc',
-    'cpp/dev/buffer_dev.cc',
-    'cpp/dev/context_3d_dev.cc',
-    'cpp/dev/directory_entry_dev.cc',
-    'cpp/dev/directory_reader_dev.cc',
-    'cpp/dev/file_chooser_dev.cc',
-    'cpp/dev/file_io_dev.cc',
-    'cpp/dev/file_ref_dev.cc',
-    'cpp/dev/file_system_dev.cc',
-    'cpp/dev/find_dev.cc',
-    'cpp/dev/font_dev.cc',
-    'cpp/dev/fullscreen_dev.cc',
-    'cpp/dev/graphics_3d_client_dev.cc',
-    'cpp/dev/graphics_3d_dev.cc',
-    'cpp/dev/printing_dev.cc',
-    'cpp/dev/scrollbar_dev.cc',
-    'cpp/dev/selection_dev.cc',
-    'cpp/dev/surface_3d_dev.cc',
-    'cpp/dev/transport_dev.cc',
-    'cpp/dev/url_util_dev.cc',
-    'cpp/dev/video_decoder_dev.cc',
-    'cpp/dev/widget_client_dev.cc',
-    'cpp/dev/widget_dev.cc',
-    'cpp/dev/zoom_dev.cc',
-    'cpp/dev/scriptable_object_deprecated.cc',
-    # End ppapi_cpp.gypi
-    # Updated automatically by update-scons.py.
-    # From ppapi_cpp.gypi:ppapi_cpp:.*\.cc
-    'cpp/ppp_entrypoints.cc',
-    # End ppapi_cpp.gypi
-    ]
+# Load ppapi_cpp.gypi
+ppapi_cpp_gypi_filename = env.File('#/../ppapi/ppapi_cpp.gypi').path
+ppapi_cpp_gypi = eval(open(ppapi_cpp_gypi_filename).read())

[Mark Seaborn, 2011/03/22 01:17:27]

Doing "eval(e, {})" would be cleaner than "eval(e)" because the former avoids
allowing variables to leak through into the eval'd scope.

[bradn, 2011/03/22 01:51:43]

Done.

+# Extract ppapi_cpp + ppapi_cpp_objects.
+ppapi_cpp_objects = [t for t in ppapi_cpp_gypi['targets']

[Mark Seaborn, 2011/03/22 01:17:27]

t -> target, perhaps?

Instead of x[0], maybe do GetOne(x) where:

def GetOne(sequence):
  assert len(sequence) == 1, sequence
  return sequence[0]

Otherwise, ordering in the Gyp file would be significant and that should
probably be commented.

[bradn, 2011/03/22 01:51:43]

Migrated to something with an assert.

+                     if t['target_name'] == 'ppapi_cpp_objects'][0]
+ppapi_cpp = [t for t in ppapi_cpp_gypi['targets']
+             if t['target_name'] == 'ppapi_cpp'][0]
+# Combine the .cpp files from there.
+cpp_sources = ([s for s in ppapi_cpp_objects['sources']

[Mark Seaborn, 2011/03/22 01:17:27]

s -> source_file?

[bradn, 2011/03/22 01:51:43]

Done.

+                    if s.endswith('.cc')] +

[Mark Seaborn, 2011/03/22 01:17:27]

Indentation is odd here.

[bradn, 2011/03/22 01:51:43]

Restructured.

+                   [s for s in ppapi_cpp['sources']
+                    if s.endswith('.cc')])
 
 env.DualLibrary('ppapi_cpp', cpp_sources)