summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuexi Ma <yuexima@google.com>2017-05-01 17:25:03 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-05-01 17:25:03 +0000
commit87f34af9bef30881d1215672319d00e4d66877ab (patch)
treeb4b2a935ea7133400b76c585e6e9dafa3f2b3c30
parent1b8163b3f1b95d1dbdf97b5ccb27a176d954ed44 (diff)
parentf17df905e6e430eb733fa78454a1af76a0aa9e1a (diff)
downloadhal-trace-87f34af9bef30881d1215672319d00e4d66877ab.tar.gz
Merge "Add pre-upload style checker for cpp and java code" am: 6947f8a084 am: 75bf1258d3
am: f17df905e6 Change-Id: Iff565a64c66427ad28de1cd0325353d72fa10e48
-rw-r--r--.clang-format13
-rw-r--r--PREUPLOAD.cfg6
2 files changed, 19 insertions, 0 deletions
diff --git a/.clang-format b/.clang-format
new file mode 100644
index 0000000..6027082
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,13 @@
+---
+Language: Cpp
+BasedOnStyle: Google
+ColumnLimit: 80
+IndentWidth: 2
+ContinuationIndentWidth: 4
+---
+Language: Java
+BasedOnStyle: Google
+ColumnLimit: 100
+IndentWidth: 4
+ContinuationIndentWidth: 8
+...
diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg
new file mode 100644
index 0000000..6be6e5f
--- /dev/null
+++ b/PREUPLOAD.cfg
@@ -0,0 +1,6 @@
+[Builtin Hooks]
+clang_format = true
+
+[Builtin Hooks Options]
+clang_format = --commit ${PREUPLOAD_COMMIT} --style file --extensions c,h,cc,cpp,java
+