Revert 183089

tools/generate_shim_headers/generate_shim_headers.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.
 
 """
 Generates shim headers that mirror the directory structure of bundled headers,
 but just forward to the system ones.
 
 This allows seamless compilation against system headers with no changes
@@ skipping 11 matching lines @@
 #error shim headers must not be used in official builds!
 #endif
 """
 
 
 def GeneratorMain(argv):
   parser = optparse.OptionParser()
   parser.add_option('--headers-root', action='append')
   parser.add_option('--define', action='append')
   parser.add_option('--output-directory')
-  parser.add_option('--prefix', default='')
   parser.add_option('--use-include-next', action='store_true')
   parser.add_option('--outputs', action='store_true')
   parser.add_option('--generate', action='store_true')
 
   options, args = parser.parse_args(argv)
 
   if not options.headers_root:
     parser.error('Missing --headers-root parameter.')
   if not options.output_directory:
     parser.error('Missing --output-directory parameter.')
@@ skipping 31 matching lines @@
               # This non-standard push_macro extension is supported
               # by compilers we support (GCC, clang).
               f.write('#pragma push_macro("%s")\n' % key)
               f.write('#undef %s\n' % key)
               f.write('#define %s %s\n' % (key, value))
 
           if include_before:
             for header in include_before.split(':'):
               f.write('#include %s\n' % header)
 
-          include_target = options.prefix + header_filename
           if options.use_include_next:
-            f.write('#include_next <%s>\n' % include_target)
+            f.write('#include_next <%s>\n' % header_filename)
           else:
-            f.write('#include <%s>\n' % include_target)
+            f.write('#include <%s>\n' % header_filename)
 
           if include_after:
             for header in include_after.split(':'):
               f.write('#include %s\n' % header)
 
           if options.define:
             for define in options.define:
               key, value = define.split('=', 1)
               # This non-standard pop_macro extension is supported
               # by compilers we support (GCC, clang).
               f.write('#pragma pop_macro("%s")\n' % key)
 
 
 def DoMain(argv):
   return '\n'.join(GeneratorMain(argv))
 
 
 if __name__ == '__main__':
   DoMain(sys.argv[1:])