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

Commit 218d9b50 authored by Fabien Sanglard's avatar Fabien Sanglard Committed by Android (Google) Code Review
Browse files

Merge "Enable google_java_format (for adb team only)" into main

parents 532d465a 390fa651

PREUPLOAD.cfg

+3 −1
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
clang_format = true

bpfmt = true

ktfmt = true

google_java_format = true



[Builtin Hooks Options]

# Only turn on clang-format check for the following subfolders.
@@ -20,9 +21,10 @@ clang_format = --commit ${PREUPLOAD_COMMIT} --style file --extensions c,h,cc,cpp 
               tools/

bpfmt = -d

ktfmt = --kotlinlang-style --include-dirs=services/permission,packages/SystemUI,libs/WindowManager/Shell/src/com/android/wm/shell/freeform,libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode,libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode,libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/desktopmode,apct-tests,tests/Input,tests/StructuredConcurrencyPerfTests

google_java_format = --include-dirs=services/core/java/com/android/server/adb



[Hook Scripts]

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

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



hidden_api_txt_checksorted_hook = ${REPO_ROOT}/tools/platform-compat/hiddenapi/checksorted_sha.sh ${PREUPLOAD_COMMIT} ${REPO_ROOT}

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
+15 −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="services/core/java/com/android/server/adb/*" checks="ImportOrder" />



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

    <suppress files="services/core/java/com/android/server/adb/*" checks="Indentation" />



    <!-- Let google-java-format handle the line length. -->

    <suppress files="services/core/java/com/android/server/adb/*" checks="LineLength" />



    <!-- Let google-java-format handle the { placement. -->

    <suppress files="services/core/java/com/android/server/adb/*" checks="LeftCurly" />

</suppressions>