summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2016-12-13 19:21:50 +0100
committerandroid-build-merger <android-build-merger@google.com>2016-12-13 19:21:50 +0100
commit3541850a9a699f17137f6c6f5a081556de7de234 (patch)
treee2d7107e971b0fda72d15b8b1bb555fec62d1c4d
parentMerge "Revert "write_bootloader_message(<options>) should not reset stage field."" (diff)
parentMerge "clang-format: Adjust short functions / if settings." (diff)
downloadandroid_bootable_recovery-3541850a9a699f17137f6c6f5a081556de7de234.tar
android_bootable_recovery-3541850a9a699f17137f6c6f5a081556de7de234.tar.gz
android_bootable_recovery-3541850a9a699f17137f6c6f5a081556de7de234.tar.bz2
android_bootable_recovery-3541850a9a699f17137f6c6f5a081556de7de234.tar.lz
android_bootable_recovery-3541850a9a699f17137f6c6f5a081556de7de234.tar.xz
android_bootable_recovery-3541850a9a699f17137f6c6f5a081556de7de234.tar.zst
android_bootable_recovery-3541850a9a699f17137f6c6f5a081556de7de234.zip
Diffstat (limited to '')
-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:.*