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

Unified Diff: depot_tools/clang_format.py

Issue 139693006: Let depot_tools use scripts from deps-pulled "script" folder. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/
Patch Set: Created 6 years, 11 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: depot_tools/clang_format.py
===================================================================
--- depot_tools/clang_format.py (revision 248419)
+++ depot_tools/clang_format.py (working copy)
@@ -62,11 +62,14 @@
def FindClangFormatScriptInChromiumTree(script_name):
"""Return a path to a clang-format helper script, or die trying."""
- # The binaries in platform-specific subdirectories in src/tools/gn/bin.
script_path = os.path.join(_FindChromiumTree(), 'src', 'third_party',
- 'clang_format', 'scripts', script_name)
+ 'clang_format', 'script', script_name)
if not os.path.exists(script_path):
- raise NotFoundError('File does not exist: %s' % script_path)
+ # TODO(thakis): Remove the fallback to the old location after a few weeks.
+ script_path = os.path.join(_FindChromiumTree(), 'src', 'third_party',
+ 'clang_format', 'scripts', script_name)
+ if not os.path.exists(script_path):
+ raise NotFoundError('File does not exist: %s' % script_path)
return script_path
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698