Snap for 7547121 from 160f6ef4f0505eabccb002b8e3b3a223e42d285c to mainline-permission-release
Change-Id: Ia48924c372b9ec5c8ec4e6c481cb4f436d3c7e19
diff --git a/checkstyle.py b/checkstyle.py
index 85a5d90..2039abb 100755
--- a/checkstyle.py
+++ b/checkstyle.py
@@ -64,7 +64,8 @@
'com.puppycrawl.tools.checkstyle.checks.imports.UnusedImportsCheck']
SKIPPED_RULES_FOR_TEST_FILES = ['com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck',
'com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck']
-SUBPATH_FOR_TEST_FILES = ['/tests/', '/test/', '/androidTest/', '/perftests/', '/gts-tests/']
+SUBPATH_FOR_TEST_FILES = ['/tests/', '/test/', '/androidTest/', '/perftests/', '/gts-tests/',
+ '/hostsidetests/']
SUBPATH_FOR_TEST_DATA_FILES = _FindFoldersContaining(git.repository_root(),
'IGNORE_CHECKSTYLE')
ERROR_UNCOMMITTED = 'You need to commit all modified files before running Checkstyle\n'
diff --git a/default-treewalker-checks.xml b/default-treewalker-checks.xml
index 7e09891..31ec899 100644
--- a/default-treewalker-checks.xml
+++ b/default-treewalker-checks.xml
@@ -83,7 +83,7 @@
</module>
<module name="LineLength">
<property name="severity" value="error"/>
- <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
+ <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://|^ *\*? \{@link .*$"/>
<property name="max" value="100"/>
</module>
<module name="LeftCurly">
@@ -117,6 +117,7 @@
<property name="severity" value="error"/>
<property name="tokens" value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LE, LITERAL_ASSERT, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN, TYPE_EXTENSION_AND" />
<property name="allowEmptyConstructors" value="true"/>
+ <property name="allowEmptyLambdas" value="true"/>
<property name="allowEmptyMethods" value="true"/>
</module>
<module name="WhitespaceAfter">
diff --git a/gitlint/git.py b/gitlint/git.py
index e55aa06..7a03705 100644
--- a/gitlint/git.py
+++ b/gitlint/git.py
@@ -126,7 +126,7 @@
# Split as bytes, as the output may have some non unicode characters.
blame_lines = subprocess.check_output(
- ['git', 'blame', (commit + '^!'), '--porcelain', '--', filename]).split(
+ ['git', 'blame', (commit + b'^!'), '--porcelain', '--', filename]).split(
os.linesep.encode('utf-8'))
modified_line_numbers = utils.filter_lines(
blame_lines,
