summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2016-12-13 19:39:52 +0100
committerandroid-build-merger <android-build-merger@google.com>2016-12-13 19:39:52 +0100
commit882f567a6e3a09af275a9ebda4f72d3dc93db8ab (patch)
treeaad15cae64329e42ad3647bf7dec716a1a8a1d0e
parentMerge "Revert "write_bootloader_message(<options>) should not reset stage field."" am: c908f4f0e3 am: 09197c47e2 am: 1b321e43e1 (diff)
parentMerge "clang-format: Adjust short functions / if settings." am: d6a5005fcb am: 3541850a9a (diff)
downloadandroid_bootable_recovery-882f567a6e3a09af275a9ebda4f72d3dc93db8ab.tar
android_bootable_recovery-882f567a6e3a09af275a9ebda4f72d3dc93db8ab.tar.gz
android_bootable_recovery-882f567a6e3a09af275a9ebda4f72d3dc93db8ab.tar.bz2
android_bootable_recovery-882f567a6e3a09af275a9ebda4f72d3dc93db8ab.tar.lz
android_bootable_recovery-882f567a6e3a09af275a9ebda4f72d3dc93db8ab.tar.xz
android_bootable_recovery-882f567a6e3a09af275a9ebda4f72d3dc93db8ab.tar.zst
android_bootable_recovery-882f567a6e3a09af275a9ebda4f72d3dc93db8ab.zip
-rw-r--r--.clang-format3
1 files changed, 2 insertions, 1 deletions
diff --git a/.clang-format b/.clang-format
index b8c642840..532278864 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,6 +1,7 @@
BasedOnStyle: Google
AllowShortBlocksOnASingleLine: false
-AllowShortFunctionsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: Empty
+AllowShortIfStatementsOnASingleLine: true
ColumnLimit: 100
CommentPragmas: NOLINT:.*