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

Commit 8c840202 authored by Tom Cherry's avatar Tom Cherry Committed by android-build-merger
Browse files

Merge "Remove extraneous .clang-format files" am: 41c7bb50 am: ef3017bd 

am: a6df6499

Change-Id: I2fe255c5119e4fc152b10bf45b3adc6f952d8430
parents e9af468c a6df6499

.clang-format-2

+0 −4
Original line number Diff line number Diff line 
BasedOnStyle: Google

AllowShortBlocksOnASingleLine: false

AllowShortFunctionsOnASingleLine: true



AccessModifierOffset: -1

ColumnLimit: 100

CommentPragmas: NOLINT:.*

DerivePointerAlignment: false

.clang-format-4

+0 −3
Original line number Diff line number Diff line 
BasedOnStyle: Google

AllowShortBlocksOnASingleLine: false

AllowShortFunctionsOnASingleLine: false



AccessModifierOffset: -2

ColumnLimit: 100

CommentPragmas: NOLINT:.*

adb/.clang-format

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

AllowShortBlocksOnASingleLine: false

AllowShortFunctionsOnASingleLine: false



AccessModifierOffset: -2

ColumnLimit: 100

CommentPragmas: NOLINT:.*

DerivePointerAlignment: false

IndentWidth: 4

PointerAlignment: Left

TabWidth: 4

UseTab: Never

PenaltyExcessCharacter: 32

adb/.clang-format

0 → 120000
+1 −13
Original line number Diff line number Diff line 
../.clang-format-4
 
 No newline at end of file

base/.clang-format

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

AllowShortBlocksOnASingleLine: false

AllowShortFunctionsOnASingleLine: false



CommentPragmas: NOLINT:.*

DerivePointerAlignment: false

IndentWidth: 2

PointerAlignment: Left

TabWidth: 2

UseTab: Never

PenaltyExcessCharacter: 32