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

Commit 64d79108 authored by Julien Desprez's avatar Julien Desprez Committed by Automerger Merge Worker
Browse files

Merge "Add robustness to possible empty BUILD_CONTEXT" into main am: 7e776b90 

Original change: https://android-review.googlesource.com/c/platform/build/+/3403022



Change-Id: I446c1a23e8a3792696369573bd4a229c14fc5d6a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 39dcc253 7e776b90

ci/build_test_suites.py

+6 −0
Original line number Diff line number Diff line
@@ -74,6 +74,12 @@ class BuildPlanner: 
    if 'optimized_build' not in self.build_context.enabled_build_features:

      return BuildPlan(set(self.args.extra_targets), set())



    if not self.build_context.test_infos:

      logging.warning('Build context has no test infos, skipping optimizations.')

      for target in self.args.extra_targets:

        get_metrics_agent().report_unoptimized_target(target, 'BUILD_CONTEXT has no test infos.')

      return BuildPlan(set(self.args.extra_targets), set())



    build_targets = set()

    packaging_commands_getters = []

    # In order to roll optimizations out differently between test suites and

ci/build_test_suites_test.py

+4 −2
Original line number Diff line number Diff line
@@ -306,7 +306,8 @@ class BuildPlannerTest(unittest.TestCase): 
    build_planner = self.create_build_planner(

        build_targets=build_targets,

        build_context=self.create_build_context(

            enabled_build_features=[{'name': self.get_target_flag('target_1')}]

            enabled_build_features=[{'name': self.get_target_flag('target_1')}],

            test_context=self.get_test_context('target_1'),

        ),

    )
@@ -322,7 +323,8 @@ class BuildPlannerTest(unittest.TestCase): 
    build_planner = self.create_build_planner(

        build_targets=build_targets,

        build_context=self.create_build_context(

            enabled_build_features=[{'name': self.get_target_flag('target_1')}]

            enabled_build_features=[{'name': self.get_target_flag('target_1')}],

            test_context=self.get_test_context('target_1'),

        ),

        packaging_commands=packaging_commands,

    )