commit 3be1d8fa7a26eb260ffbad36d174a7535b6716f5
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue May 10 07:21:29 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue May 10 07:21:29 2022 +0000
tree 166094d4ece2cbfb7eb3adbcc2987f0ef0f7bfbf
parent 8f59b238b33ca6147419b4221321348097e7f5b0
parent b0e92456311a4b4e9e399f02074977adddb75f1e

Snap for 8564071 from b0e92456311a4b4e9e399f02074977adddb75f1e to mainline-conscrypt-release

Change-Id: I286c03820d0d918128917649f5ce456625c03120

checkstyle.py

diff --git a/checkstyle.py b/checkstyle.py
index 2039abb..06e2390 100755
--- a/checkstyle.py
+++ b/checkstyle.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 
 #
 # Copyright 2015, The Android Open Source Project
@@ -65,7 +65,7 @@
 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/',
-                          '/hostsidetests/']
+                          '/hostsidetests/', '/jvmTest/']
 SUBPATH_FOR_TEST_DATA_FILES = _FindFoldersContaining(git.repository_root(),
                                                      'IGNORE_CHECKSTYLE')
 ERROR_UNCOMMITTED = 'You need to commit all modified files before running Checkstyle\n'

tests.py

diff --git a/tests.py b/tests.py
index 7c9c7e4..0e7dd1f 100755
--- a/tests.py
+++ b/tests.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 
 #
 # Copyright 2015, The Android Open Source Project