Pepper: Reduce includes in generated thunks.

ppapi/generators/idl_thunk.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 C++ style thunks """
 
 import glob
 import os
 import re
@@ skipping 442 matching lines @@
 
     if meta.BuiltinIncludes():
       for include in sorted(meta.BuiltinIncludes()):
         out.Write('#include <%s>\n' % include)
       out.Write('\n')
 
     # TODO(teravest): Don't emit includes we don't need.
     includes = ['ppapi/c/pp_errors.h',
                 'ppapi/shared_impl/tracked_callback.h',
                 'ppapi/thunk/enter.h',
-                'ppapi/thunk/ppb_instance_api.h',
-                'ppapi/thunk/resource_creation_api.h',
-                'ppapi/thunk/thunk.h']
+                'ppapi/thunk/ppapi_thunk_export.h']
     includes.append(_GetHeaderFileName(filenode))
     for api in meta.Apis():
       includes.append('%s' % api.lower())
     for i in meta.Includes():
       includes.append(i)
     for include in sorted(includes):
       out.Write('#include "%s"\n' % include)
     out.Write('\n')
     out.Write('namespace ppapi {\n')
     out.Write('namespace thunk {\n')
@@ skipping 64 matching lines @@
               version = child.GetVersion(
                   child.first_release[build]).replace('.', '_')
               name += '_' + version
             generated_functions.append(name)
         out.Write(',\n'.join(['  &%s' % f for f in generated_functions]))
         out.Write('\n};\n\n')
 
     out.Write('}  // namespace\n')
     out.Write('\n')
     for thunk_type, thunk_name in version_list:
-      thunk_decl = 'const %s* Get%s_Thunk() {\n' % (thunk_type, thunk_type)
+      thunk_decl = ('PPAPI_THUNK_EXPORT const %s* Get%s_Thunk() {\n' %
+                    (thunk_type, thunk_type))
       if len(thunk_decl) > 80:
-        thunk_decl = 'const %s*\n    Get%s_Thunk() {\n' % (thunk_type,
-                                                           thunk_type)
+        thunk_decl = ('PPAPI_THUNK_EXPORT const %s*\n    Get%s_Thunk() {\n' %
+                      (thunk_type, thunk_type))
       out.Write(thunk_decl)
       out.Write('  return &%s;\n' % thunk_name)
       out.Write('}\n')
       out.Write('\n')
     out.Write('}  // namespace thunk\n')
     out.Write('}  // namespace ppapi\n')
 
 
 tgen = TGen()
 
@@ skipping 14 matching lines @@
     print "Golden file for M13-M15 failed."
     failed = 1
   else:
     print "Golden file for M13-M15 passed."
 
   return failed
 
 
 if __name__ == '__main__':
   sys.exit(Main(sys.argv[1:]))