diff options
| author | Tom Cherry <tomcherry@google.com> | 2019-06-05 15:30:14 -0700 |
|---|---|---|
| committer | Tom Cherry <tomcherry@google.com> | 2019-06-05 15:30:14 -0700 |
| commit | c077eefc1e5007a5c656183737e82d5c0a7df855 (patch) | |
| tree | f2fd3e43eeed7fc6b84239651bc1ac548239b8fa | |
| parent | 7d06395f0c12ce8c265639106a5666ae04f1a447 (diff) | |
| download | build_soong-c077eefc1e5007a5c656183737e82d5c0a7df855.tar.gz build_soong-c077eefc1e5007a5c656183737e82d5c0a7df855.tar.bz2 build_soong-c077eefc1e5007a5c656183737e82d5c0a7df855.zip | |
system-clang-format: Add IncludeBlocks: Preserve
As of [1], the Google format, which we default to, uses IncludeBlocks:
Regroup, which sorts all includes with <> and without .h into the top
group reserved for libc headers, e.g.:
+#include <android-base/properties.h>
+#include <android-base/strings.h>
#include <ctype.h>
#include <stdlib.h>
#include <sys/system_properties.h>
#include <iostream>
-#include <android-base/properties.h>
-#include <android-base/strings.h>
This is accurate to the Google C++ style guide, which states that
other library headers should be included with "", however we have a
strong tendency to use <> for these headers for Android, so we must
revert this change.
Note, clang-format allows regexes for creating the blocks as well,
however, short of including all possible libc headers, I don't think
there's a way to differentiate between <sys/wait.h> and
<other_lib/header.h>.
[1]:
https://github.com/llvm-mirror/clang/commit/62e3198c4f5490a1c60ba51d81fe2e1f0dc99135#diff-b689ebff2e51e675b346a88289e74542
Test: clang-format doesn't do the above.
Change-Id: Ifef605ffd6b4c8a36512377644e64ddd26b68a21
| -rw-r--r-- | scripts/system-clang-format | 1 | ||||
| -rw-r--r-- | scripts/system-clang-format-2 | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/scripts/system-clang-format b/scripts/system-clang-format index 55773a29..14abd934 100644 --- a/scripts/system-clang-format +++ b/scripts/system-clang-format @@ -4,6 +4,7 @@ AllowShortFunctionsOnASingleLine: Inline ColumnLimit: 100 CommentPragmas: NOLINT:.* DerivePointerAlignment: false +IncludeBlocks: Preserve IndentWidth: 4 ContinuationIndentWidth: 8 PointerAlignment: Left diff --git a/scripts/system-clang-format-2 b/scripts/system-clang-format-2 index ede5d7e1..e28b379c 100644 --- a/scripts/system-clang-format-2 +++ b/scripts/system-clang-format-2 @@ -3,6 +3,7 @@ AllowShortFunctionsOnASingleLine: Inline ColumnLimit: 100 CommentPragmas: NOLINT:.* DerivePointerAlignment: false +IncludeBlocks: Preserve IndentWidth: 2 PointerAlignment: Left TabWidth: 2 |