From 67a194019375e7a3584458dd87b613f0f5714162 Mon Sep 17 00:00:00 2001 From: "auto-submit[bot]" <98614782+auto-submit[bot]@users.noreply.github.com> Date: Wed, 9 Oct 2024 21:31:46 +0000 Subject: [PATCH] Reverts "Reverts "Run gen_snapshot under /usr/bin/time (#55777)" (#55787)" (#55789) Reverts: flutter/engine#55787 Initiated by: matanlurey Reason for reverting: We determined this was an expected failure. Original PR Author: auto-submit[bot] Reviewed By: {fluttergithubbot} This change reverts the following previous change: Reverts: flutter/engine#55777 Initiated by: matanlurey Reason for reverting: Breaks CI postsubmit (https://ci.chromium.org/ui/p/flutter/builders/prod/Mac%20Production%20Engine%20Drone/485517/overview). Original PR Author: aam Reviewed By: {matanlurey} This change reverts the following previous change: This should help further troubleshoot https://github.com/flutter/flutter/issues/154437 --- DEPS | 2 +- lib/snapshot/BUILD.gn | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 07f331794cb55..15e6f7c72cab9 100644 --- a/DEPS +++ b/DEPS @@ -277,7 +277,7 @@ allowed_hosts = [ ] deps = { - 'src': 'https://github.com/flutter/buildroot.git' + '@' + 'f85c3be4bf808add6ba867b8ff7943fd235b7b5e', + 'src': 'https://github.com/flutter/buildroot.git' + '@' + '773652167dbd506c5fb85d168e2c9038f24fed2a', 'src/flutter/third_party/depot_tools': Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '580b4ff3f5cd0dcaa2eacda28cefe0f45320e8f7', diff --git a/lib/snapshot/BUILD.gn b/lib/snapshot/BUILD.gn index 73611e45063ab..6c6ce7fce573c 100644 --- a/lib/snapshot/BUILD.gn +++ b/lib/snapshot/BUILD.gn @@ -63,6 +63,9 @@ group("generate_snapshot_bins") { # See: `bin_to_linkable` rules below that build these outputs into linkable form # See: https://github.com/flutter/flutter/wiki/Flutter-engine-operation-in-AOT-Mode compiled_action("generate_snapshot_bin") { + # TODO(https://github.com/flutter/flutter/issues/154437). + prefix_with_time_cmd = true + if (target_cpu == "x86" && host_os == "linux") { # By default Dart will create a 32-bit gen_snapshot host binary if the target # platform is 32-bit. Override this to create a 64-bit gen_snapshot for x86