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

Commit 14cf65b2 authored by Jordan Demeulenaere's avatar Jordan Demeulenaere Committed by Android (Google) Code Review
Browse files

Merge changes from topic "ktfmt-v049" into main 

* changes:
  Replace ktfmt.py hook by built-in hook in SystemUI/
  Remove Kotlin files excluded in SystemUI ktfmt hook
parents 994a4187 846b7988

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 −740

File deleted.

Preview size limit exceeded, changes collapsed.