Merge "Add a 2 width option of clang format."

am: 9a22ae5f57

Change-Id: Id8022fe0da3d6940d68b5fead2ee431f7065f9f9
This commit is contained in:
Christopher Ferris 2017-03-10 22:53:09 +00:00 committed by android-build-merger
commit 692048ae6b
4 changed files with 28 additions and 13 deletions

View file

@ -1,13 +0,0 @@
BasedOnStyle: Google
AllowShortBlocksOnASingleLine: false
AllowShortFunctionsOnASingleLine: false
AccessModifierOffset: -2
ColumnLimit: 100
CommentPragmas: NOLINT:.*
DerivePointerAlignment: false
IndentWidth: 4
PointerAlignment: Left
TabWidth: 4
UseTab: Never
PenaltyExcessCharacter: 32

1
.clang-format Symbolic link
View file

@ -0,0 +1 @@
.clang-format-4

13
.clang-format-2 Normal file
View file

@ -0,0 +1,13 @@
BasedOnStyle: Google
AllowShortBlocksOnASingleLine: false
AllowShortFunctionsOnASingleLine: true
AccessModifierOffset: -1
ColumnLimit: 100
CommentPragmas: NOLINT:.*
DerivePointerAlignment: false
IndentWidth: 2
PointerAlignment: Left
TabWidth: 2
UseTab: Never
PenaltyExcessCharacter: 32

13
.clang-format-4 Normal file
View file

@ -0,0 +1,13 @@
BasedOnStyle: Google
AllowShortBlocksOnASingleLine: false
AllowShortFunctionsOnASingleLine: false
AccessModifierOffset: -2
ColumnLimit: 100
CommentPragmas: NOLINT:.*
DerivePointerAlignment: false
IndentWidth: 4
PointerAlignment: Left
TabWidth: 4
UseTab: Never
PenaltyExcessCharacter: 32

1
libbacktrace/.clang-format Symbolic link
View file

@ -0,0 +1 @@
../.clang-format-2