commit b78998c4477c0a16795a89e4af4d3b2270ce8ad2
author Treehugger Robot <treehugger-gerrit@google.com> Mon Jan 28 20:16:54 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 28 20:16:54 2019 +0000
tree 1d402d5d868622072f02100101348a227f0ebbba
parent ffa7aadf755ca967b24db232cc6fbe71060eb79d
parent 65e2b2322046b869201fb4f6def09cd2303fd532

Merge "Replace clang-format with symlink."

.clang-format

diff --git a/.clang-format b/.clang-format
deleted file mode 100644
index f5c9843..0000000
--- a/.clang-format
+++ /dev/null
@@ -1,15 +0,0 @@
-# https://clang.llvm.org/docs/ClangFormatStyleOptions.html
-# Please keep this file in sync with system/core/.clang-format-4
-#
-BasedOnStyle: Google
-AccessModifierOffset: -2
-AllowShortFunctionsOnASingleLine: Inline
-BreakBeforeTernaryOperators: true
-ColumnLimit: 100
-CommentPragmas: NOLINT:.*
-DerivePointerAlignment: false
-IndentWidth: 4
-ContinuationIndentWidth: 4
-PointerAlignment: Left
-TabWidth: 4
-UseTab: Never

.clang-format

diff --git a/.clang-format b/.clang-format
new file mode 120000
index 0000000..ddcf5a2
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1 @@
+../../build/soong/scripts/system-clang-format
\ No newline at end of file