5b4eb23cfd
The .clang-format files in the base, debuggerd, adb, libprocinfo, and fastboot subdirectories each differ slightly from the top level .clang-format-2 and .clang-format-4, but not in a substantially meaningful way, as the source files in those directories have not been re-formatted with clang-format. Therefore, let's reduce the differences and use only the two top level clang-format files. Secondly perform some small clean-up of the top level .clang-format files. AllowShortBlocksOnASingleLine is already false in the Google style, so it can be removed. AllowShortFunctionsOnASingleLine should not change between the -2 and -4 versions, so leave it at the Google default style in both, which is 'All'. The diff stats for these changes are: ./base/ Old: 640 insertions(+), 531 deletions(-) New: 563 insertions(+), 808 deletions(-) ./debuggerd/ Old: 910 insertions(+), 886 deletions(-) New: 991 insertions(+), 1023 deletions(-) ./adb/ Old: 2623 insertions(+), 2886 deletions(-) New: 2655 insertions(+), 3103 deletions(-) ./libprocinfo/ Old: 2 insertions(+), 1 deletion(-) New: 4 insertions(+), 18 deletions(-) ./fastboot/ Old: 618 insertions(+), 743 deletions(-) New: 726 insertions(+), 882 deletions(-) ./init/ Old: 1755 insertions(+), 1866 deletions(-) New: 1715 insertions(+), 1952 deletions(-) Test: Above clang-format stats Change-Id: I3f7b8ab0660c8394c5008ba95ea15e70dd22b55b
9 lines
185 B
Text
9 lines
185 B
Text
BasedOnStyle: Google
|
|
ColumnLimit: 100
|
|
CommentPragmas: NOLINT:.*
|
|
DerivePointerAlignment: false
|
|
IndentWidth: 2
|
|
PointerAlignment: Left
|
|
TabWidth: 2
|
|
UseTab: Never
|
|
PenaltyExcessCharacter: 32
|