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

Commit 7db7298c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add ktfmt to PREUPLOAD.cfg" am: 1804b80d am: b09f10f3 

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



Change-Id: I650eb1d479b8fe6c1e11abdc7517f8a5ca2a278c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 09233f57 b09f10f3

PREUPLOAD.cfg

+5 −0
Original line number Diff line number Diff line
@@ -5,11 +5,13 @@ ignore_merged_commits = true 
clang_format = true

rustfmt = true

bpfmt = true

ktfmt = true



[Builtin Hooks Options]

rustfmt = --config-path=rustfmt.toml

# Only turn on clang-format check for C and C++ headers and sources

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}
@@ -20,3 +22,6 @@ checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPL 
                      service/

aosp_first = ${REPO_ROOT}/frameworks/base/tools/aosp/aosp_sha.sh ${PREUPLOAD_COMMIT} ${PREUPLOAD_FILES}

yapf_hook = ./system/tools/scripts/yapf_checker.py



[Tool Paths]

ktfmt = ${REPO_ROOT}/packages/modules/Bluetooth/tools/ktfmt

tools/ktfmt

0 → 100755
+5 −0
Original line number Diff line number Diff line 
#!/usr/bin/env bash



ROOT=$(dirname "$(realpath "$0")")/../../../../



"$ROOT/prebuilts/jdk/jdk17/linux-x86/bin/java" -jar "$ROOT/prebuilts/build-tools/common/framework/ktfmt.jar" "$@"
 
 No newline at end of file