Revert 111618 - Reapply of http://codereview.chromium.org/8632023/

ppapi/native_client/src/shared/ppapi/nacl.scons

Index: ppapi/native_client/src/shared/ppapi/nacl.scons
===================================================================
--- ppapi/native_client/src/shared/ppapi/nacl.scons	(revision 111620)
+++ ppapi/native_client/src/shared/ppapi/nacl.scons	(working copy)
@@ -16,24 +16,17 @@
 env.FilterOut(CCFLAGS=['-Wswitch-enum'])
 
 # Load ppapi_cpp.gypi
-# Unfortunately gyp_extract does not handle variables or includes so we must
-# pull the list of sources from ppapi_sources.gypi directly.
-
-ppapi_sources_gypi = open(
-    env.File('$SOURCE_ROOT/ppapi/ppapi_sources.gypi').abspath, 'r').read()
-ppapi_sources_list = eval(ppapi_sources_gypi)['variables']['cpp_sources']
-
-# From ppapi_cpp.gypi:ppapi_cpp:.*\.cc
 ppapi_cpp_gypi = gyp_extract.LoadGypFile(
     env.File('$SOURCE_ROOT/ppapi/ppapi_cpp.gypi').abspath)
 
-
+# From ppapi_cpp.gypi:ppapi_cpp_objects:.*\.cc
+# From ppapi_cpp.gypi:ppapi_cpp:.*\.cc
 cpp_sources = (
-    [src for src in ppapi_sources_list if src.endswith('.cc')] +
     gyp_extract.GypTargetSources(
+        ppapi_cpp_gypi, 'ppapi_cpp_objects', '.*\.cc') +
+    gyp_extract.GypTargetSources(
         ppapi_cpp_gypi, 'ppapi_cpp', '.*\.cc')
 )
-
 libppapi_cpp = env.NaClSdkLibrary('libppapi_cpp', cpp_sources)
 env.AddLibraryToSdk(libppapi_cpp)