summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2016-12-12 23:49:21 +0100
committerTao Bao <tbao@google.com>2016-12-13 00:00:52 +0100
commite65fa0a892e617edf59ff2f3468cbd2fc4ff6101 (patch)
tree9c805c72007ccb32b3e20e523a03e569bd6afc03
parentMerge "recovery: Remove obsolete code that supports "CACHE:foo" format." (diff)
downloadandroid_bootable_recovery-e65fa0a892e617edf59ff2f3468cbd2fc4ff6101.tar
android_bootable_recovery-e65fa0a892e617edf59ff2f3468cbd2fc4ff6101.tar.gz
android_bootable_recovery-e65fa0a892e617edf59ff2f3468cbd2fc4ff6101.tar.bz2
android_bootable_recovery-e65fa0a892e617edf59ff2f3468cbd2fc4ff6101.tar.lz
android_bootable_recovery-e65fa0a892e617edf59ff2f3468cbd2fc4ff6101.tar.xz
android_bootable_recovery-e65fa0a892e617edf59ff2f3468cbd2fc4ff6101.tar.zst
android_bootable_recovery-e65fa0a892e617edf59ff2f3468cbd2fc4ff6101.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:.*