Update clang-format for correct Java style.

Move clang-format so it applies to the whole tree, and update for Java
style that is compatible with style with existing AOSP style.

Test: clang-format -style=file
Change-Id: I8cf854cc290669f9efefc34dcaddc43075978dfb

diff --git a/jni/.clang-format b/.clang-format
similarity index 85%
rename from jni/.clang-format
rename to .clang-format
index fa9d143..178675d 100644 (file)
--- a/jni/.clang-format
+++ b/.clang-format
@@ -22,3 +22,11 @@
 BasedOnStyle: Google
 CommentPragmas: NOLINT:.*
 DerivePointerAlignment: false
+
+---
+Language: Java
+BasedOnStyle: Google
+IndentWidth: 4
+ContinuationIndentWidth: 8
+ColumnLimit: 100
+AllowShortIfStatementsOnASingleLine: true