Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 63ea0180 authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge "Format: update clang rules to follow guidelines" into main am: c62fb0bd 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3141559



Change-Id: I430722d8888d2dbb1b951913bd2fc7001ba2d4fd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f8f42787 c62fb0bd

.clang-format

+23 −2
Original line number Diff line number Diff line
@@ -19,6 +19,27 @@ 
# accommodate for handling of the large legacy code base.

#



# AOSP is based on google style with some modification commented below

BasedOnStyle: Google

CommentPragmas: NOLINT:.*

DerivePointerAlignment: false
 


---

Language: Cpp

# AOSP ask for 4, but we are not ready to touch every single line

# IndentWidth: 4 # vs 2

ColumnLimit: 100 # vs 80

ContinuationIndentWidth: 8 # vs 4

AccessModifierOffset: -2 # vs -1 Should be -4 when updating IndentWidth to 4

Standard: c++20 # vs Auto

AllowShortIfStatementsOnASingleLine: Never # vs WithoutElse

AllowShortLoopsOnASingleLine: false # vs true

SpacesBeforeTrailingComments: 1 # vs 2



# Allow clang-format to automatically fix more things

RemoveSemicolon: true

InsertBraces: true

RemoveParentheses: ReturnStatement



---

Language: Java

# Java format is handled by google-java-format

DisableFormat: true

CPPLINT.cfg

+3 −0
Original line number Diff line number Diff line 
set noparent

linelength=100

# Do not check access modifier indentation.

# CPPLint enforces +1, but our rule is no indentation.

filter=-whitespace/indent
 
 No newline at end of file

android/app/.clang-format

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
#

# Copyright (C) 2016 The Android Open Source Project

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.

#



#

# Below are some minor deviations from the default Google style to

# accommodate for handling of the large legacy code base.

#



BasedOnStyle: Google

CommentPragmas: NOLINT:.*

DerivePointerAlignment: false



---

Language: Java

# Java format is handled by check_style hook

DisableFormat: true

SortIncludes: false

framework/.clang-format

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
BasedOnStyle: Google



AccessModifierOffset: -4

AlignOperands: false

AllowShortFunctionsOnASingleLine: Inline

AlwaysBreakBeforeMultilineStrings: false

ColumnLimit: 100

CommentPragmas: NOLINT:.*

ConstructorInitializerIndentWidth: 6

ContinuationIndentWidth: 8

IndentWidth: 4

PenaltyBreakBeforeFirstCallParameter: 100000

SpacesBeforeTrailingComments: 1

service/.clang-format

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
BasedOnStyle: Google



AccessModifierOffset: -4

AlignOperands: false

AllowShortFunctionsOnASingleLine: Inline

AlwaysBreakBeforeMultilineStrings: false

ColumnLimit: 100

CommentPragmas: NOLINT:.*

ConstructorInitializerIndentWidth: 6

ContinuationIndentWidth: 8

IndentWidth: 4

PenaltyBreakBeforeFirstCallParameter: 100000

SpacesBeforeTrailingComments: 1