Don't assume output dir + "../.." == src/ in ui/gl/generate_bindings.py

ui/gl/generate_bindings.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.
 
 """code generator for GL/GLES extension wrangler."""
 
 import optparse
 import os
 import collections
@@ skipping 1945 matching lines @@
 
   # Add extensions that do not have any functions.
   used_extensions.update(extra_extensions)
 
   return used_extensions
 
 
 def ResolveHeader(header, header_paths):
   paths = header_paths.split(':')
 
-  # Always use a path for Chromium-specific extensions. They are extracted
-  # to separate files.
-  paths.append('.')
-  paths.append('../../gpu')
-
-  root = os.path.abspath(os.path.dirname(__file__))
-
   for path in paths:
     result = os.path.join(path, header)
     if not os.path.isabs(path):
-      result = os.path.relpath(os.path.join(root, result), os.getcwd())
+      result = os.path.relpath(os.path.join(os.getcwd(), result), os.getcwd())

[Ken Russell (switch to Gerrit), 2014/06/05 17:56:41]

Why is using cwd correct? What does rebase_path in the .gn file produce? A path
relative to cwd?

     if os.path.exists(result):
       # Always use forward slashes as path separators. Otherwise backslashes
       # may be incorrectly interpreted as escape characters.
       return result.replace(os.path.sep, '/')
 
   raise Exception('Header %s not found.' % header)
 
 
 def main(argv):
   """This is the main function."""
@@ skipping 62 matching lines @@
 
   source_file = open(os.path.join(directory, 'gl_bindings_autogen_mock.cc'),
                      'wb')
   GenerateMockBindingsSource(source_file, GL_FUNCTIONS)
   source_file.close()
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))