Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1414)

Unified Diff: ui/gl/generate_bindings.py

Issue 317813002: Don't assume output dir + "../.." == src/ in ui/gl/generate_bindings.py (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/gl/BUILD.gn ('k') | ui/gl/gl.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/generate_bindings.py
diff --git a/ui/gl/generate_bindings.py b/ui/gl/generate_bindings.py
index c647f9e2696ad7ca5f1577400f5ac4dd58dede58..248e4ff1d318323bbaab86d1f49309d916f4c55d 100755
--- a/ui/gl/generate_bindings.py
+++ b/ui/gl/generate_bindings.py
@@ -1963,17 +1963,10 @@ def FillExtensionsFromHeaders(functions, extension_headers, extra_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
if os.path.exists(result):
# Always use forward slashes as path separators. Otherwise backslashes
# may be incorrectly interpreted as escape characters.
« no previous file with comments | « ui/gl/BUILD.gn ('k') | ui/gl/gl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698