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

Support new third_party/google-java-format/cipd/ path.

Browse Source 
Bug: 345761161
Change-Id: I23d0c4eceb76706eb286fe87baaf6f93f93747eb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/5608492
Commit-Queue: Joanna Wang <jojwang@chromium.org>
Reviewed-by: Josip Sokcevic <sokcevic@chromium.org>
This commit is contained in:
Joanna Wang
2024-06-07 17:16:57 +00:00
committed by LUCI CQ
parent 56ce75edd1
commit b7b7718b47
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
google_java_format.py
View File

@@ -28,7 +28,12 @@ def FindGoogleJavaFormat():
'google-java-format', 'google-java-format')
# Check that the .jar exists, since it is conditionally downloaded via
# DEPS conditions.
if os.path.exists(path) and os.path.exists(path + '.jar'):
# 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
return None