Manifest for pie-b4s4-release.

[android-x86/manifest.git] / GLOBAL-PREUPLOAD.cfg

diff --git a/GLOBAL-PREUPLOAD.cfg b/GLOBAL-PREUPLOAD.cfg
index 4bd1f48..b98a673 100644 (file)
--- a/GLOBAL-PREUPLOAD.cfg
+++ b/GLOBAL-PREUPLOAD.cfg
@@ -2,5 +2,16 @@
 # listed in the manifest.  Do not turn on things here without first consulting
 # the wider Android team, and make sure you send out a PSA before landing.
 
+[Options]
+ignore_merged_commits = true
+
 [Builtin Hooks]
 commit_msg_test_field = true
+
+[Tool Paths]
+clang-format = ${REPO_ROOT}/prebuilts/clang/host/${BUILD_OS}/clang-stable/bin/clang-format
+git-clang-format = ${REPO_ROOT}/prebuilts/clang/host/${BUILD_OS}/clang-stable/bin/git-clang-format
+gofmt = ${REPO_ROOT}/prebuilts/go/${BUILD_OS}/bin/gofmt
+google-java-format = ${REPO_ROOT}/prebuilts/tools/common/google-java-format/google-java-format
+google-java-format-diff = ${REPO_ROOT}/prebuilts/tools/common/google-java-format/google-java-format-diff.py
+cpplint = ${REPO_ROOT}/external/google-styleguide/cpplint/cpplint.py