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

Commit faa5b0e7 authored by Devin Moore's avatar Devin Moore
Browse files

add new finalize.py 

This splits the finalization step from the bump.py script.

Now bump.py is only responsible for creating next year's FCM, kernel
configs, and updating the build files.

The new finalize.py script moves the latest FCM (the one being finalized)
unconditionally into SYSTEM_MATRIX_DEPS so all targets, regardless of
release configuration, will incude it in their builds.

Test: ./compatibility_matrices/finalize.py && m
Test: ./build/tools/build-step-0.sh
Bug: 388532499

Change-Id: Ic1c3bf1e82f54602aee514b541a927d4b02852d2
Merged-In: Ic1c3bf1e82f54602aee514b541a927d4b02852d2
parent f60db8ad

compatibility_matrices/bump.py

+2 −5
Original line number Diff line number Diff line
@@ -111,14 +111,11 @@ class Bump(object): 
            "kernel_configs", "-a", " ".join(next_kernel_configs), android_bp

        ])



        # update the SYSTEM_MATRIX_DEPS variable and the phony module's

        # product_variables entry.

        # Replace the phony module's product_variables entry to add the new FCM

        # to the development targets (trunk* configs).

        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:

compatibility_matrices/finalize.py

0 → 100755
+79 −0
Original line number Diff line number Diff line 
#!/usr/bin/env python3

#

# Copyright (C) 2025 The Android Open Source Project

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.

#

"""

Finalizes the current compatibility matrix and allows `next` targets to

use the new FCM.

"""



import argparse

import os

import pathlib

import re

import subprocess

import textwrap





def check_call(*args, **kwargs):

    print(args)

    subprocess.check_call(*args, **kwargs)



def check_output(*args, **kwargs):

    print(args)

    return subprocess.check_output(*args, **kwargs)



class Bump(object):



    def __init__(self, cmdline_args):

        self.top = pathlib.Path(os.environ["ANDROID_BUILD_TOP"])

        self.interfaces_dir = self.top / "hardware/interfaces"



        self.current_level = cmdline_args.current_level

        self.current_module_name = f"framework_compatibility_matrix.{self.current_level}.xml"

        self.device_module_name = "framework_compatibility_matrix.device.xml"



    def run(self):

        self.edit_android_bp()



    def edit_android_bp(self):

        android_bp = self.interfaces_dir / "compatibility_matrices/Android.bp"



        # update the SYSTEM_MATRIX_DEPS variable to unconditionally include the

        # latests FCM. This adds the file to `next` configs so releasing devices

        # can use the latest interfaces.

        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")



              lines.append(line)



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

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



def main():

    parser = argparse.ArgumentParser(description=__doc__)

    parser.add_argument("current_level",

                        type=str,

                        help="VINTF level of the current version (e.g. 202404)")

    cmdline_args = parser.parse_args()



    Bump(cmdline_args).run()





if __name__ == "__main__":

    main()