commit c681ccd79b358eaa466a6bbe9366b2725cae8a9d
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Dec 12 22:05:34 2024 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Dec 12 22:05:34 2024 -0800
tree a07ac7047e9a111b0cf4dbf1667020c77dedd2e4
parent 259227b23dc31e7a5e73da2014f90b1ddb648c15
parent a28cb0fcfb8b83397b09d6651e569973cbfdb513

Merge "Disable ktfmt and rely solely on ktlint for Kotlin linting" into main am: a28cb0fcfb

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3411517

Change-Id: I9f80da5b69a2cfe93b785a9d0130b2369617a911
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

PREUPLOAD.cfg

diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg
index 39009cb..c301397 100644
--- a/PREUPLOAD.cfg
+++ b/PREUPLOAD.cfg
@@ -1,15 +1,13 @@
 [Builtin Hooks]
 bpfmt = true
 clang_format = true
-ktfmt = true
 
 [Builtin Hooks Options]
 clang_format = --commit ${PREUPLOAD_COMMIT} --style file --extensions c,h,cc,cpp,hpp
-ktfmt = --kotlinlang-style
 
 [Hook Scripts]
 checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT}
 
-ktlint_hook = ${REPO_ROOT}/prebuilts/ktlint/ktlint.py --no-verify-format -f ${PREUPLOAD_FILES}
+ktlint_hook = ${REPO_ROOT}/prebuilts/ktlint/ktlint.py --disabled-rules comment-wrapping -f ${PREUPLOAD_FILES}
 
 hidden_api_txt_checksorted_hook = ${REPO_ROOT}/tools/platform-compat/hiddenapi/checksorted_sha.sh ${PREUPLOAD_COMMIT} ${REPO_ROOT}