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

Make google-java-format easier to use for non-chromium checkouts like R8

Browse Source 
1. Use "codereview.settings" in addition to "buildtools" as the marker
   that identifies a project root.
2. Allow the presence of any .jar file to indicate the availability of
   google-java-format.
3. Do not pass --aosp when running google-java-format

Bug: 456461246
Change-Id: Id27b3c03f592a0ed73fb7a6b4dd662707a649166
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/7102758
Reviewed-by: Scott Lee <ddoman@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
This commit is contained in:
Andrew Grieve
2025-10-30 12:05:33 -07:00
committed by LUCI CQ
parent 251779412a
commit 33744dc6bc
3 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gclient_paths.py
View File

@@ -80,7 +80,8 @@ def _GetPrimarySolutionPathInternal(cwd):
return os.path.join(gclient_root, source_dir_name) return os.path.join(gclient_root, source_dir_name)
# Some projects might not use .gclient. Try to see whether we're in a git # Some projects might not use .gclient. Try to see whether we're in a git
# checkout that contains a 'buildtools' subdir. # checkout that contains a "buildtools" directory or "codereview.settings"
# file.
top_dir = cwd top_dir = cwd
try: try:
top_dir = subprocess2.check_output( top_dir = subprocess2.check_output(
@@ -90,7 +91,8 @@ def _GetPrimarySolutionPathInternal(cwd):
except subprocess2.CalledProcessError: except subprocess2.CalledProcessError:
pass pass
if os.path.exists(os.path.join(top_dir, 'buildtools')): if (os.path.exists(os.path.join(top_dir, 'codereview.settings'))
or os.path.exists(os.path.join(top_dir, 'buildtools'))):
return top_dir return top_dir
return None return None

9
git_cl.py
View File

@@ -6839,7 +6839,14 @@ def _RunGoogleJavaFormat(opts, paths, top_dir, diffs):
print('google-java-format not found, skipping java formatting.') print('google-java-format not found, skipping java formatting.')
return 0 return 0
base_cmd = [tool, '--aosp'] base_cmd = [tool]
# The script now adds --aosp, but this shim is needed for the window where
# devs are using depot_tools that is newer than their chromium checkout.
# This can be remove after Dec 2025.
if os.path.exists(
os.path.join(os.path.dirname(tool), 'chromium-overrides.jar')):
base_cmd += ['--aosp']
if not opts.diff: if not opts.diff:
if opts.dry_run: if opts.dry_run:
base_cmd += ['--dry-run'] base_cmd += ['--dry-run']

20
google_java_format.py
View File

@@ -9,6 +9,7 @@ you sync Chrome. This script finds and runs the executable.
""" """
import gclient_paths import gclient_paths
import glob
import os import os
import subprocess import subprocess
import sys import sys
@@ -24,19 +25,16 @@ def FindGoogleJavaFormat():
# Make relative to solution root if not an absolute path. # Make relative to solution root if not an absolute path.
return os.path.join(primary_solution_path, override) return os.path.join(primary_solution_path, override)
bin_path = os.path.join(primary_solution_path, 'third_party', bin_dir = os.path.join(primary_solution_path, 'third_party',
'google-java-format', 'google-java-format') 'google-java-format')
cipd_path = os.path.join(primary_solution_path, 'third_party', bin_path = os.path.join(bin_dir, 'google-java-format')
'google-java-format', 'cipd',
'google-java-format.jar')
# Check that the .jar exists, since it is conditionally downloaded via # Check that the .jar exists, since it is conditionally downloaded via
# DEPS conditions. # DEPS conditions.
# TODO(b/345761161): Remove old os.path.exists(path + '.jar') check, if os.path.exists(bin_path):
# when third_party/google-java-format if glob.glob(os.path.join(bin_dir, '*.jar')) or glob.glob(
# -> third_party/google-java-format/cipd is fully rolled out. os.path.join(bin_dir, 'cipd', '*.jar')):
if os.path.exists(bin_path) and (os.path.exists(bin_path + '.jar') return bin_path
or os.path.exists(cipd_path)):
return bin_path
return None return None