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

Commit c8d75a80 authored by Thiébaud Weksteen's avatar Thiébaud Weksteen Committed by Automerger Merge Worker
Browse files

Merge changes I08f5aa3e,I7876e44c,I4e90a045 into main am: 0959d41b 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2737055



Change-Id: I0d06d70c95d2a1a812f1f4c6e19e23729cd00f9e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 45fd5b75 0959d41b

tools/lint/common/Android.bp

+27 −0
Original line number Original line Diff line number Diff line
@@ -27,3 +27,30 @@ java_library_host { 
    libs: ["lint_api"],

    libs: ["lint_api"],

    kotlincflags: ["-Xjvm-default=all"],

    kotlincflags: ["-Xjvm-default=all"],

}

}



java_defaults {

    name: "AndroidLintCheckerTestDefaults",

    srcs: ["checks/src/test/java/**/*.kt"],

    static_libs: [

        "junit",

        "lint",

        "lint_tests",

    ],

    test_options: {

        unit_test: true,

        tradefed_options: [

            {

                // lint bundles in some classes that were built with older versions

                // of libraries, and no longer load. Since tradefed tries to load

                // all classes in the jar to look for tests, it crashes loading them.

                // Exclude these classes from tradefed's search.

                name: "exclude-paths",

                value: "org/apache",

            },

            {

                name: "exclude-paths",

                value: "META-INF",

            },

        ],

    },

}

tools/lint/global/checks/src/main/java/com/google/android/lint/aidl/AidlImplementationDetector.kt→tools/lint/common/src/main/java/com/google/android/lint/aidl/AidlImplementationDetector.kt

+0 −0

File moved.

View file

tools/lint/global/checks/src/main/java/com/google/android/lint/aidl/EnforcePermissionUtils.kt→tools/lint/common/src/main/java/com/google/android/lint/aidl/EnforcePermissionUtils.kt

+0 −0

File moved.

View file

tools/lint/fix/soong_lint_fix.py

+66 −37
Original line number Original line Diff line number Diff line
@@ -29,6 +29,39 @@ PATH_PREFIX = "out/soong/.intermediates" 
PATH_SUFFIX = "android_common/lint"

PATH_SUFFIX = "android_common/lint"

FIX_ZIP = "suggested-fixes.zip"

FIX_ZIP = "suggested-fixes.zip"







class SoongModule:

    """A Soong module to lint.



    The constructor takes the name of the module (for example,

    "framework-minus-apex"). find() must be called to extract the intermediate

    module path from Soong's module-info.json

    """

    def __init__(self, name):

        self._name = name



    def find(self, module_info):

        """Finds the module in the loaded module_info.json."""

        if self._name not in module_info:

            raise Exception(f"Module {self._name} not found!")



        partial_path = module_info[self._name]["path"][0]

        print(f"Found module {partial_path}/{self._name}.")

        self._path = f"{PATH_PREFIX}/{partial_path}/{self._name}/{PATH_SUFFIX}"



    @property

    def name(self):

        return self._name



    @property

    def lint_report(self):

        return f"{self._path}/lint-report.txt"



    @property

    def suggested_fixes(self):

        return f"{self._path}/{FIX_ZIP}"





class SoongLintFix:

class SoongLintFix:

    """

    """

    This class creates a command line tool that will

    This class creates a command line tool that will
@@ -53,16 +86,14 @@ class SoongLintFix: 
        self._parser = _setup_parser()

        self._parser = _setup_parser()

        self._args = None

        self._args = None

        self._kwargs = None

        self._kwargs = None

        self._path = None

        self._modules = []

        self._target = None







    def run(self, additional_setup=None, custom_fix=None):

    def run(self):

        """

        """

        Run the script

        Run the script

        """

        """

        self._setup()

        self._setup()

        self._find_module()

        self._find_modules()

        self._lint()

        self._lint()





        if not self._args.no_fix:

        if not self._args.no_fix:
@@ -87,8 +118,6 @@ class SoongLintFix: 




        os.chdir(ANDROID_BUILD_TOP)

        os.chdir(ANDROID_BUILD_TOP)







    def _find_module(self):

        print("Refreshing soong modules...")

        print("Refreshing soong modules...")

        try:

        try:

            os.mkdir(ANDROID_PRODUCT_OUT)

            os.mkdir(ANDROID_PRODUCT_OUT)
@@ -97,36 +126,35 @@ class SoongLintFix: 
        subprocess.call(f"{SOONG_UI} --make-mode {PRODUCT_OUT}/module-info.json", **self._kwargs)

        subprocess.call(f"{SOONG_UI} --make-mode {PRODUCT_OUT}/module-info.json", **self._kwargs)

        print("done.")

        print("done.")







    def _find_modules(self):

        with open(f"{ANDROID_PRODUCT_OUT}/module-info.json") as f:

        with open(f"{ANDROID_PRODUCT_OUT}/module-info.json") as f:

            module_info = json.load(f)

            module_info = json.load(f)





        if self._args.module not in module_info:

        for module_name in self._args.modules:

            sys.exit(f"Module {self._args.module} not found!")

            module = SoongModule(module_name)



            module.find(module_info)

        module_path = module_info[self._args.module]["path"][0]

            self._modules.append(module)

        print(f"Found module {module_path}/{self._args.module}.")



        self._path = f"{PATH_PREFIX}/{module_path}/{self._args.module}/{PATH_SUFFIX}"

        self._target = f"{self._path}/lint-report.txt"







    def _lint(self):

    def _lint(self):

        print("Cleaning up any old lint results...")

        print("Cleaning up any old lint results...")

        for module in self._modules:

            try:

            try:

            os.remove(f"{self._target}")

                os.remove(f"{module.lint_report}")

            os.remove(f"{self._path}/{FIX_ZIP}")

                os.remove(f"{module.suggested_fixes}")

            except FileNotFoundError:

            except FileNotFoundError:

                pass

                pass

        print("done.")

        print("done.")





        print(f"Generating {self._target}")

        target = " ".join([ module.lint_report for module in self._modules ])

        subprocess.call(f"{SOONG_UI} --make-mode {self._target}", **self._kwargs)

        print(f"Generating {target}")

        subprocess.call(f"{SOONG_UI} --make-mode {target}", **self._kwargs)

        print("done.")

        print("done.")







    def _fix(self):

    def _fix(self):

        print("Copying suggested fixes to the tree...")

        for module in self._modules:

        with zipfile.ZipFile(f"{self._path}/{FIX_ZIP}") as zip:

            print(f"Copying suggested fixes for {module.name} to the tree...")

            with zipfile.ZipFile(f"{module.suggested_fixes}") as zip:

                for name in zip.namelist():

                for name in zip.namelist():

                    if name.startswith("out") or not name.endswith(".java"):

                    if name.startswith("out") or not name.endswith(".java"):

                        continue

                        continue
@@ -134,10 +162,10 @@ class SoongLintFix: 
                        shutil.copyfileobj(src, dst)

                        shutil.copyfileobj(src, dst)

            print("done.")

            print("done.")







    def _print(self):

    def _print(self):

        print("### lint-report.txt ###", end="\n\n")

        for module in self._modules:

        with open(self._target, "r") as f:

            print(f"### lint-report.txt {module.name} ###", end="\n\n")

            with open(module.lint_report, "r") as f:

                print(f.read())

                print(f.read())
@@ -151,7 +179,8 @@ def _setup_parser(): 
        **Gotcha**: You must have run `source build/envsetup.sh` and `lunch` first.

        **Gotcha**: You must have run `source build/envsetup.sh` and `lunch` first.

        """, formatter_class=argparse.RawTextHelpFormatter)

        """, formatter_class=argparse.RawTextHelpFormatter)





    parser.add_argument('module',

    parser.add_argument('modules',

                        nargs='+',

                        help='The soong build module to run '

                        help='The soong build module to run '

                             '(e.g. framework-minus-apex or services.core.unboosted)')

                             '(e.g. framework-minus-apex or services.core.unboosted)')