commit d643d6dc5adfe2ffcac821da0fc727f13b929855
author Alexander Aprelev <aam@google.com> Tue Oct 08 16:41:12 2024 +0000
committer CQ Bot Account <flutter-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Oct 08 16:41:12 2024 +0000
tree 5426c3ff72717e6de9a97ac40e50c097884127d7
parent 971f48cdd7fe71c15066714f33a41b47b5d50622

Fix location for gen_snapshot that has to get copied.

Follow-up to 971f48cdd7fe71c15066714f33a41b47b5d50622

Bug: https://github.com/flutter/flutter/issues/154437
Change-Id: Ic9f8052ef99160db67f73b65c8e5de6c39ea6fc4
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/60280
Reviewed-by: Zach Anderson <zra@google.com>
Commit-Queue: Alexander Aprelev <aam@google.com>

recipe_modules/build_util/api.py

diff --git a/recipe_modules/build_util/api.py b/recipe_modules/build_util/api.py
index 81c8f3f..9f876ce 100644
--- a/recipe_modules/build_util/api.py
+++ b/recipe_modules/build_util/api.py
@@ -142,7 +142,7 @@
         infra_steps=True):
       gen_snapshots = self.m.file.glob_paths(
           "find gen_snapshots",
-          build_dir,
+          build_dir / "clang_arm64",
           "gen_snapshot",
           test_data=(build_dir / "clang_arm64/gen_snapshot",),
       )

recipe_modules/build_util/examples/full.expected/win.json

diff --git a/recipe_modules/build_util/examples/full.expected/win.json b/recipe_modules/build_util/examples/full.expected/win.json
index 23cc242..5be1661 100644
--- a/recipe_modules/build_util/examples/full.expected/win.json
+++ b/recipe_modules/build_util/examples/full.expected/win.json
@@ -684,7 +684,7 @@
       "--json-output",
       "/path/to/tmp/json",
       "glob",
-      "[START_DIR]\\out\\release",
+      "[START_DIR]\\out\\release\\clang_arm64",
       "gen_snapshot"
     ],
     "env_suffixes": {
@@ -699,7 +699,7 @@
     "name": "upload gen_snapshots.find gen_snapshots",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@glob@[START_DIR]\\out\\release\\[START_DIR]\\out\\release\\clang_arm64\\gen_snapshot@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]\\out\\release\\clang_arm64\\[START_DIR]\\out\\release\\clang_arm64\\gen_snapshot@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },
@@ -711,7 +711,7 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[START_DIR]\\out\\release\\[START_DIR]\\out\\release\\clang_arm64\\gen_snapshot",
+      "[START_DIR]\\out\\release\\clang_arm64\\[START_DIR]\\out\\release\\clang_arm64\\gen_snapshot",
       "[START_DIR]"
     ],
     "env_suffixes": {
@@ -723,7 +723,7 @@
       ]
     },
     "infra_step": true,
-    "name": "upload gen_snapshots.Copy gen_snapshot file [START_DIR]\\out\\release\\[START_DIR]\\out\\release\\clang_arm64\\gen_snapshot",
+    "name": "upload gen_snapshots.Copy gen_snapshot file [START_DIR]\\out\\release\\clang_arm64\\[START_DIR]\\out\\release\\clang_arm64\\gen_snapshot",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]