[NaCl SDK] Allow ppapi_simple executables to run in both sel_ldr and in chrome.

native_client_sdk/src/build_tools/generate_make.py

 # 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.
 
 import json
 import os
 import sys
 
 import buildbot_common
 import build_version
@@ skipping 171 matching lines @@
     if not os.path.exists(dst_path):
       buildbot_common.MakeDir(dst_path)
     buildbot_common.CopyFile(src_file, dst_file)
 
 
 def ModifyDescInPlace(desc):
   """Perform post-load processing on .dsc file data.
 
   Currently this consists of:
   - Add -Wall to CXXFLAGS
-  - Synthesize SEL_LDR_LIBS and SEL_LDR_DEPS by stripping
-    down LIBS and DEPS (removing certain ppapi-only libs).
   """
 
-  ppapi_only_libs = ['ppapi_simple']
-
   for target in desc['TARGETS']:
     target.setdefault('CXXFLAGS', [])
     target['CXXFLAGS'].insert(0, '-Wall')
 
-    def filter_out(key):
-      value = target.get(key, [])
-      if type(value) == dict:
-        value = dict(value)
-        for key in value.keys():
-          value[key] = [v for v in value[key] if v not in ppapi_only_libs]
-      else:
-        value = [v for v in value if v not in ppapi_only_libs]
-      return value
-
-    target['SEL_LDR_LIBS'] = filter_out('LIBS')
-    target['SEL_LDR_DEPS'] = filter_out('DEPS')
-
 
 def ProcessProject(pepperdir, srcroot, dstroot, desc, toolchains, configs=None,
                    first_toolchain=False):
   if not configs:
     configs = ['Debug', 'Release']
 
   name = desc['NAME']
   out_dir = os.path.join(dstroot, desc['DEST'], name)
   buildbot_common.MakeDir(out_dir)
   srcdirs = desc.get('SEARCH', ['.', SDK_RESOURCE_DIR])
@@ skipping 65 matching lines @@
   rel_path = os.path.relpath(pepperdir, os.path.dirname(out_path))
   template_dict = {
     'projects': targets,
     'deps' : deps,
     'rel_sdk' : rel_path,
   }
   RunTemplateFileIfChanged(in_path, out_path, template_dict)
   outdir = os.path.dirname(os.path.abspath(out_path))
   if getos.GetPlatform() == 'win':
     AddMakeBat(pepperdir, outdir)