diff --git a/autoninja.py b/autoninja.py index 7f100d1e5..008777bae 100755 --- a/autoninja.py +++ b/autoninja.py @@ -166,11 +166,11 @@ def main(args): siso_marker = os.path.join(output_dir, '.siso_deps') if use_siso: - ninja_marker = os.path.join(output_dir, '.ninja_log') # autosiso generates a .ninja_log file so the mere existence of a # .ninja_log file doesn't imply that a ninja build was done. However # if there is a .ninja_log but no .siso_deps then that implies a # ninja build. + ninja_marker = os.path.join(output_dir, '.ninja_log') if os.path.exists(ninja_marker) and not os.path.exists(siso_marker): print('Run gn clean before switching from ninja to siso in %s' % output_dir, diff --git a/post_build_ninja_summary.py b/post_build_ninja_summary.py index 9f2f7f52a..c864b955f 100755 --- a/post_build_ninja_summary.py +++ b/post_build_ninja_summary.py @@ -117,8 +117,8 @@ def ReadTargets(log, show_all): The result is a list of Target objects.""" header = log.readline() - # TODO: b/298594790 - Siso currently generates empty .ninja_log files. - # Handle them gracefully by silently returning an empty list of targets. + # Handle empty ninja_log gracefully by silently returning an empty list of + # targets. if not header: return [] assert header == '# ninja log v5\n', \