InTheForest/chromium_depot_tools
1
0
Fork 0
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools.git synced 2026-01-11 02:31:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix google-java-format/cipd exists check.

Browse Source 
Bug: b/345761161
Change-Id: I3e3e7d84d962530b02a345d14ad8c15f57a49838
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/5606286
Auto-Submit: Joanna Wang <jojwang@chromium.org>
Commit-Queue: Josip Sokcevic <sokcevic@chromium.org>
Reviewed-by: Josip Sokcevic <sokcevic@chromium.org>
This commit is contained in:
Joanna Wang
2024-06-07 18:20:28 +00:00
committed by LUCI CQ
parent dd8b5ea401
commit 705b8d2d85
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
google_java_format.py
View File

@@ -24,17 +24,19 @@ def FindGoogleJavaFormat():
# Make relative to solution root if not an absolute path.
return os.path.join(primary_solution_path, override)
path = os.path.join(primary_solution_path, 'third_party',
'google-java-format', 'google-java-format')
bin_path = os.path.join(primary_solution_path, 'third_party',
'google-java-format', 'google-java-format')
cipd_path = os.path.join(primary_solution_path, 'third_party',
'google-java-format', 'cipd',
'google-java-format.jar')
# Check that the .jar exists, since it is conditionally downloaded via
# DEPS conditions.
# TODO(b/345761161): Remove old os.path.exists(path + '.jar') check,
# when third_party/google-java-format
# -> third_party/google-java-format/cipd is fully rolled out.
if os.path.exists(path) and (
os.path.exists(path + '.jar')
or os.path.exists(os.path.join(path, 'cipd') + '.jar')):
return path
if os.path.exists(bin_path) and (os.path.exists(bin_path + '.jar')
or os.path.exists(cipd_path)):
return bin_path
return None