diff options
| author | Aurimas Liutikas <aurimas@google.com> | 2016-01-25 19:34:00 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-01-25 19:34:00 +0000 |
| commit | 25b53809192b30c41013b676d34485044f898e3b (patch) | |
| tree | a82a9cdad74889e0f12ecf60f37bf11c99a087f0 /tools | |
| parent | 49b3b24bbc0bec9b5ffc4d08c8178cef61bd5b77 (diff) | |
| parent | 23e2d4b3ebb6995edc7363e8b9ea645f8cfbaf29 (diff) | |
| download | android_development-25b53809192b30c41013b676d34485044f898e3b.tar.gz android_development-25b53809192b30c41013b676d34485044f898e3b.tar.bz2 android_development-25b53809192b30c41013b676d34485044f898e3b.zip | |
Add new two new rules to Checkstyle.
am: 23e2d4b3eb
* commit '23e2d4b3ebb6995edc7363e8b9ea645f8cfbaf29':
Add new two new rules to Checkstyle.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/checkstyle/android-style.xml | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/tools/checkstyle/android-style.xml b/tools/checkstyle/android-style.xml index 620498f16..680dbef76 100644 --- a/tools/checkstyle/android-style.xml +++ b/tools/checkstyle/android-style.xml @@ -4,6 +4,11 @@ <module name="Checker"> <property name="severity" value="warning"/> <property name="charset" value="UTF-8"/> + <module name="SuppressionCommentFilter"> + <property name="offCommentFormat" value="CHECKSTYLE:OFF IndentationCheck"/> + <property name="onCommentFormat" value="CHECKSTYLE:ON IndentationCheck"/> + <property name="checkFormat" value="IndentationCheck"/> + </module> <module name="TreeWalker"> <module name="AvoidStarImport"> <property name="severity" value="error"/> @@ -192,6 +197,7 @@ <property name="tokens" value="COMMA"/> <property name="option" value="EOL"/> </module> + <module name="FileContentsHolder"/> </module> <module name="FileTabCharacter"> <property name="severity" value="error"/> @@ -200,11 +206,9 @@ <property name="severity" value="error"/> <property name="format" value="[ \t]+$"/> <property name="message" value="Trailing whitespace"/> - </module> -<!-- + </module> <module name="RegexpHeader"> <property name="severity" value="error"/> - <property name="header" value="^/*$\n^ * Copyright (C) 2015 The Android Open Source Project" /> + <property name="header" value="^/\*\n \* Copyright \(C\) [0-9]{4} The Android Open Source Project\n \*\n \* Licensed under the Apache License, Version 2\.0 \(the \"License\"\);\n \* you may not use this file except in compliance with the License.\n \* You may obtain a copy of the License at\n \*\n \* http:\/\/www\.apache\.org\/licenses\/LICENSE-2\.0\n \*\n \* Unless required by applicable law or agreed to in writing, software\n \* distributed under the License is distributed on an "AS IS" BASIS,\n \* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied\.\n \* See the License for the specific language governing permissions and\n \* limitations under the License\.\n \*\/" /> </module> ---> </module> |