From f2201709233e29e5d943937a9593891a140dc4cd Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Mon, 16 Sep 2019 11:45:17 -0700 Subject: [PATCH] vold: use system-clang-format Link .clang-format to the standard .clang-format file (4-space-indent version) from build/soong, rather than use a custom file. Among other changes, the standard file has the "IncludeBlocks: Preserve" setting, so include blocks stay in order. Don't actually reformat all the code yet. Test: Tried 'clang-format -i $(find . -name \*.cpp -o -name \*.h)' and checked that the changes look sane. Change-Id: I11ecbd03b31e44ba7b3e01175a6fc317f8173ab0 --- .clang-format | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) mode change 100644 => 120000 .clang-format diff --git a/.clang-format b/.clang-format deleted file mode 100644 index ae4a451..0000000 --- a/.clang-format +++ /dev/null @@ -1,11 +0,0 @@ -BasedOnStyle: Google -AccessModifierOffset: -2 -AllowShortFunctionsOnASingleLine: Inline -ColumnLimit: 100 -CommentPragmas: NOLINT:.* -DerivePointerAlignment: false -IndentWidth: 4 -PointerAlignment: Left -TabWidth: 4 -UseTab: Never -PenaltyExcessCharacter: 32 diff --git a/.clang-format b/.clang-format new file mode 120000 index 0000000..ddcf5a2 --- /dev/null +++ b/.clang-format @@ -0,0 +1 @@ +../../build/soong/scripts/system-clang-format \ No newline at end of file