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

Commit 1f2f4cd2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "bump.py: modify the phony system_compatibility_matrix.xml module" into main am: 36470a44 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3261369



Change-Id: I226e868c106c545d289aeac1a33dd67fe4ab6ddf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 15795826 36470a44

compatibility_matrices/bump.py

+19 −0
Original line number Original line Diff line number Diff line
@@ -111,6 +111,25 @@ class Bump(object): 
            "kernel_configs", "-a", " ".join(next_kernel_configs), android_bp

            "kernel_configs", "-a", " ".join(next_kernel_configs), android_bp

        ])

        ])





        # update the SYSTEM_MATRIX_DEPS variable and the phony module's

        # product_variables entry.

        lines = []

        with open(android_bp) as f:

            for line in f:

              if f"    \"{self.device_module_name}\",\n" in line:

                  lines.append(f"    \"{self.current_module_name}\",\n")



              if f"                \"{self.current_module_name}\",\n" in line:

                  lines.append(f"                \"{self.next_module_name}\",\n")

              else:

                  lines.append(line)



        with open(android_bp, "w") as f:

            f.write("".join(lines))





    # This Android.mk file may be deprecated soon and the functionality is

    # replaced by the soong phony module system_compatibility_matrix.xml.

    def edit_android_mk(self):

    def edit_android_mk(self):

        android_mk = self.interfaces_dir / "compatibility_matrices/Android.mk"

        android_mk = self.interfaces_dir / "compatibility_matrices/Android.mk"

        lines = []

        lines = []