summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2016-12-13 19:33:51 +0100
committerandroid-build-merger <android-build-merger@google.com>2016-12-13 19:33:51 +0100
commit59c917aa028e5377929b0095987e315b3dc44e70 (patch)
treea240f9ba44fb0f80092a62621a8a7279ba300145
parentMerge "Revert "write_bootloader_message(<options>) should not reset stage field."" am: c908f4f0e3 am: 09197c47e2 (diff)
parentMerge "clang-format: Adjust short functions / if settings." am: d6a5005fcb (diff)
downloadandroid_bootable_recovery-59c917aa028e5377929b0095987e315b3dc44e70.tar
android_bootable_recovery-59c917aa028e5377929b0095987e315b3dc44e70.tar.gz
android_bootable_recovery-59c917aa028e5377929b0095987e315b3dc44e70.tar.bz2
android_bootable_recovery-59c917aa028e5377929b0095987e315b3dc44e70.tar.lz
android_bootable_recovery-59c917aa028e5377929b0095987e315b3dc44e70.tar.xz
android_bootable_recovery-59c917aa028e5377929b0095987e315b3dc44e70.tar.zst
android_bootable_recovery-59c917aa028e5377929b0095987e315b3dc44e70.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:.*