Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 846b7988 authored by Jordan Demeulenaere's avatar Jordan Demeulenaere
Browse files

Replace ktfmt.py hook by built-in hook in SystemUI/ 

This CL replaces the ktfmt.py hook of this repository by the builtin
ktfmt hook. This will allow to delete our custom hook and provide
features like automatic fixup (see http://screen/5uXuuPgs7oL83c2).

Note that this also means that this CL is upgrading ktfmt from v0.43 to
v0.49, so it is expected to see some minor formatting diffs on existing
files after this CL is submitted.

Bug: 342153000
Test: N/A
Flag: NONE Repohook Update
Change-Id: I62d20facadc82b542b008afca4f28aaad80eaf2c
parent 222ed6ca

PREUPLOAD.cfg

+5 −2
Original line number Diff line number Diff line 
[Builtin Hooks]

clang_format = true

bpfmt = true

ktfmt = true



[Builtin Hooks Options]

# Only turn on clang-format check for the following subfolders.
@@ -17,6 +18,7 @@ clang_format = --commit ${PREUPLOAD_COMMIT} --style file --extensions c,h,cc,cpp 
               tests/

               tools/

bpfmt = -d

ktfmt = --kotlinlang-style --include-dirs=services/permission,packages/SystemUI



[Hook Scripts]

checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT}
@@ -25,9 +27,10 @@ hidden_api_txt_checksorted_hook = ${REPO_ROOT}/tools/platform-compat/hiddenapi/c 


hidden_api_txt_exclude_hook = ${REPO_ROOT}/frameworks/base/tools/hiddenapi/exclude.sh ${PREUPLOAD_COMMIT} ${REPO_ROOT}



ktfmt_hook = ${REPO_ROOT}/external/ktfmt/ktfmt.py --check -i ${REPO_ROOT}/frameworks/base/ktfmt_includes.txt ${PREUPLOAD_FILES}



ktlint_hook = ${REPO_ROOT}/prebuilts/ktlint/ktlint.py --no-verify-format -f ${PREUPLOAD_FILES}



# This flag check hook runs only for "packages/SystemUI" subdirectory. If you want to include this check for other subdirectories, please modify flag_check.py.

flag_hook = ${REPO_ROOT}/frameworks/base/packages/SystemUI/flag_check.py --msg=${PREUPLOAD_COMMIT_MESSAGE} --files=${PREUPLOAD_FILES} --project=${REPO_PATH}



[Tool Paths]

ktfmt = ${REPO_ROOT}/prebuilts/build-tools/common/framework/ktfmt.jar

ktfmt_includes.txt

deleted100644 → 0
+0 −2
Original line number Diff line number Diff line 
+services/permission

+packages/SystemUI