Remove extraneous .clang-format options for Java.
After the change, the only remaining options are those documented in
go/android-style. Other options are the default, which is the Google
style.
Change-Id: Ie81b54a23b43fa99ec3129667fe0893fbbf08ad5
diff --git a/.clang-format b/.clang-format
index 969b941..ba0bff3 100644
--- a/.clang-format
+++ b/.clang-format
@@ -28,13 +28,8 @@
Language: Java
-AccessModifierOffset: -4
-AlignOperands: false
-AllowShortFunctionsOnASingleLine: Inline
-AlwaysBreakBeforeMultilineStrings: false
ColumnLimit: 100
CommentPragmas: (NOLINT|CHECK[^ ]*):.*
-ConstructorInitializerIndentWidth: 6
ContinuationIndentWidth: 8
IndentWidth: 4
JavaImportGroups:
@@ -49,5 +44,3 @@
- org
- java
- javax
-PenaltyBreakBeforeFirstCallParameter: 100000
-SpacesBeforeTrailingComments: 1
diff --git a/.clang-format-java-2 b/.clang-format-java-2
index 3ae2e00..956bdcd 100644
--- a/.clang-format-java-2
+++ b/.clang-format-java-2
@@ -30,13 +30,8 @@
Language: Java
-AccessModifierOffset: -2
-AlignOperands: false
-AllowShortFunctionsOnASingleLine: Inline
-AlwaysBreakBeforeMultilineStrings: false
ColumnLimit: 100
CommentPragmas: (NOLINT|CHECK[^ ]*):.*
-ConstructorInitializerIndentWidth: 4
ContinuationIndentWidth: 4
IndentWidth: 2
JavaImportGroups:
@@ -51,5 +46,3 @@
- org
- java
- javax
-PenaltyBreakBeforeFirstCallParameter: 100000
-SpacesBeforeTrailingComments: 1