Merge "Fix kotlin formatter" into main am: 994e4b77aa am: 0288be3751
Original change: https://android-review.googlesource.com/c/platform/external/cronet/+/3500337
Change-Id: Ia276e51a86a2e4840329ce0ae08da2125cd2e95b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg
index 3fb0afe..6b3f107 100644
--- a/PREUPLOAD.cfg
+++ b/PREUPLOAD.cfg
@@ -8,9 +8,12 @@
google_java_format = true
ktfmt = true
+[Tool Paths]
+ktfmt = ${REPO_ROOT}/external/ktfmt/ktfmt.sh
+
[Builtin Hooks Options]
# Formatters are only enabled for android/ and test_runner/ directories as they are not
# imported from Chromium but developed in AOSP.
google_java_format = --commit ${PREUPLOAD_COMMIT} --include-dirs=android,test_runner
-ktfmt = --commit ${PREUPLOAD_COMMIT} --include-dirs=android,test_runner
+ktfmt = --kotlinlang-style --include-dirs=android,test_runner
clang_format = --commit ${PREUPLOAD_COMMIT} --style file --extensions c,h,cc,cpp,hpp android/ test_runner/