Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef0ee188 authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge "Put back checkstyle to include more than format" into main am: 758f2617 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3116934



Change-Id: I3ebdaf31aca483ef5cbda1486e8c7e061504a641
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f678d267 758f2617

PREUPLOAD.cfg

+8 −0
Original line number Diff line number Diff line
@@ -19,6 +19,14 @@ rustfmt = --config-path=rustfmt.toml 


[Hook Scripts]

aosp_first = ${REPO_ROOT}/frameworks/base/tools/aosp/aosp_sha.sh ${PREUPLOAD_COMMIT} ${PREUPLOAD_FILES}

# google_java_format only fixes indentation. This has Android specific checks like "m" prefix.

checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT}

                  --config_xml checkstyle.xml

                  -fw android/app/src/com/android/bluetooth/

                      android/app/lib/mapapi/com/android/bluetooth/mapapi/

                      android/app/tests/src/com/android/bluetooth/

                      framework/

                      service/

yapf_hook = ./system/tools/scripts/yapf_checker.py



[Tool Paths]

checkstyle.xml

0 → 100644
+19 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "http://www.puppycrawl.com/dtds/configuration_1_3.dtd" [

  <!ENTITY defaultCopyrightCheck SYSTEM "../../../prebuilts/checkstyle/default-copyright-check.xml">

  <!ENTITY defaultJavadocChecks SYSTEM "../../../prebuilts/checkstyle/default-javadoc-checks.xml">

  <!ENTITY defaultTreewalkerChecks SYSTEM "../../../prebuilts/checkstyle/default-treewalker-checks.xml">

  <!ENTITY defaultModuleChecks SYSTEM "../../../prebuilts/checkstyle/default-module-checks.xml">

]>



<module name="Checker">

  &defaultModuleChecks;

  &defaultCopyrightCheck;

  <module name="TreeWalker">

    &defaultJavadocChecks;

    &defaultTreewalkerChecks;

  </module>

  <module name="SuppressionFilter">

    <property name="file" value="checkstyle_suppressions.xml" />

  </module>

</module>

checkstyle_suppressions.xml

0 → 100644
+6 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<!DOCTYPE suppressions PUBLIC "-//Puppy Crawl//DTD Suppressions 1.1//EN" "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">

<suppressions>

    <!-- Let google-java-format handle the ImportOrder. -->

    <suppress files=".*" checks="ImportOrder" />

</suppressions>