From 689e5d365a77abe571e91c414d1ea1378b3dd19a Mon Sep 17 00:00:00 2001 From: David Duarte Date: Tue, 28 Mar 2023 20:03:16 +0000 Subject: Add ktfmt to PREUPLOAD.cfg Test: manual with pre-upload.py Change-Id: I42876cc232115d07d6b9f2131df5b43f8698738a Bug: 262605980 --- PREUPLOAD.cfg | 5 +++++ tools/ktfmt | 5 +++++ 2 files changed, 10 insertions(+) create mode 100755 tools/ktfmt diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg index 2bc46fa3ff..ea65a03e97 100644 --- a/PREUPLOAD.cfg +++ b/PREUPLOAD.cfg @@ -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 diff --git a/tools/ktfmt b/tools/ktfmt new file mode 100755 index 0000000000..caf8a358d5 --- /dev/null +++ b/tools/ktfmt @@ -0,0 +1,5 @@ +#!/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 -- cgit v1.2.3-59-g8ed1b