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

Commit 2f7f3086 authored May 18, 2020 by Zach Johnson Committed by Automerger Merge Worker May 18, 2020

Merge changes I28f66f36,Ibfd8282a am: 5ff3191f

Change-Id: I9cca8806908eee4cd6de4d0be5bb80afa59031b3

parents 920343ff 5ff3191f

.style.yapf

+1 −0

Original line number	Diff line number	Diff line
		@@ -2,3 +2,4 @@
		# http://google.github.io/styleguide/pyguide.html
		based_on_style: google
		indent_width: 4
		column_limit: 120

system/gd/.clang-format

+4 −1

Original line number	Diff line number	Diff line
		@@ -24,5 +24,8 @@ CommentPragmas: NOLINT:.*
		DerivePointerAlignment: false
		ColumnLimit: 120
		AllowShortFunctionsOnASingleLine: Empty
		ConstructorInitializerAllOnOneLineOrOnePerLine: false
		ConstructorInitializerAllOnOneLineOrOnePerLine: true
		BreakConstructorInitializers: BeforeColon
		AlignAfterOpenBracket: AlwaysBreak
		BinPackArguments: false
		BinPackParameters: false

system/gd/docs/architecture/style_guide.md

+1 −0

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@ with the following modifications as shown in the
		```yapf
		based_on_style: google
		indent_width: 4
		column_limit: 120
		```

		## Build files