From 6737f4251475ce41b349083456cfe532d5a7cd07 Mon Sep 17 00:00:00 2001 From: David Staessens <dstaessens@google.com> Date: Mon, 25 May 2020 17:40:11 +0900 Subject: [PATCH] v4l2_codec2: Don't allow clang-format to merge include groups. The clang-format configuration for the code under v4l2_codec2 seems to be unable to distingush between std includes (e.g. "<string.h>") and other includes (e.g. #include "<utils/Log.h>") and groups them together. To avoid this this CL adds "IncludeBlocks: Preserve" to the .clang-format file. Bug: 143333813 Test: ./clang-format and checked output Change-Id: I9f18daa783b089d7493f686797d474ad1c64f00a --- .clang-format | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.clang-format b/.clang-format index b043d46..880e9cb 100644 --- a/.clang-format +++ b/.clang-format @@ -31,3 +31,5 @@ IndentCaseLabels: false ReflowComments: false # Android does support C++11 now. Standard: Cpp11 +# Don't merge include blocks. +IncludeBlocks: Preserve -- GitLab