summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Aurimas Liutikas <aurimas@google.com> 2020-07-10 18:57:46 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-07-10 18:57:46 +0000
commit79a6b9ef819009c2419d00d84aea892ac68e8a61 (patch)
tree30628c53c5567e1036704825e8caf70a9eb6d1ed
parentf75db473e136fd9d9f986c1d7e5373057e13742f (diff)
parent6fcdf94948ab216e807e733d455a8c3f52e512df (diff)
Merge "Revert "Temporarily disable checkstyle hook"" into rvc-dev am: d9df6c3024 am: 1d4959b110 am: 6fcdf94948
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12129283 Change-Id: I4491ffbe961e7348ccda807bc0b0e915df0b278d
-rw-r--r--PREUPLOAD.cfg2
1 files changed, 2 insertions, 0 deletions
diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg
index 9b290c6a4760..2fd2e33bbc37 100644
--- a/PREUPLOAD.cfg
+++ b/PREUPLOAD.cfg
@@ -12,6 +12,8 @@ clang_format = --commit ${PREUPLOAD_COMMIT} --style file --extensions c,h,cc,cpp
services/incremental/
[Hook Scripts]
+checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT}
+
strings_lint_hook = ${REPO_ROOT}/frameworks/base/tools/stringslint/stringslint_sha.sh ${PREUPLOAD_COMMIT}
hidden_api_txt_checksorted_hook = ${REPO_ROOT}/frameworks/base/tools/hiddenapi/checksorted_sha.sh ${PREUPLOAD_COMMIT} ${REPO_ROOT}