diff options
| author | Yuexi Ma <yuexima@google.com> | 2017-05-01 17:21:03 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-01 17:21:03 +0000 |
| commit | f17df905e6e430eb733fa78454a1af76a0aa9e1a (patch) | |
| tree | 5a0beeb05368ec10d3981695e0787b183c828921 | |
| parent | dc2dfb3c8b8f7c04a3c6f8966339224d514db4a4 (diff) | |
| parent | 75bf1258d3015318b1a436237aded4b0ba4b8851 (diff) | |
| download | hal-trace-f17df905e6e430eb733fa78454a1af76a0aa9e1a.tar.gz | |
Merge "Add pre-upload style checker for cpp and java code" am: 6947f8a084
am: 75bf1258d3
Change-Id: I7d8bf36a3334258d0ec88200358653108d81126d
| -rw-r--r-- | .clang-format | 13 | ||||
| -rw-r--r-- | PREUPLOAD.cfg | 6 |
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 + |