Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 78f4ffa

Browse files
Reverts "Copy gen_snapshots using python's shutil.copy, avoid links (#55830)" (#56034)
Reverts: #55830 Initiated by: chinmaygarde Reason for reverting: Incremental builds are broken. flutter/flutter#157367 Original PR Author: aam Reviewed By: {mraleph, cbracken} This change reverts the following previous change: Default implementation of copy does it via hardlink, which seems to be causing issues with Gatekeeper on mac. BUG=flutter/flutter#154437
1 parent 2d3f0f4 commit 78f4ffa

File tree

3 files changed

+2
-34
lines changed

3 files changed

+2
-34
lines changed

ci/licenses_golden/excluded_files

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,6 @@
436436
../../../flutter/sky/packages/sky_engine/README.md
437437
../../../flutter/sky/packages/sky_engine/lib/_embedder.yaml
438438
../../../flutter/sky/packages/sky_engine/pubspec.yaml
439-
../../../flutter/sky/tools/cp.py
440439
../../../flutter/sky/tools/create_embedder_framework.py
441440
../../../flutter/sky/tools/create_ios_framework.py
442441
../../../flutter/sky/tools/create_macos_binary.py

lib/snapshot/BUILD.gn

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -201,18 +201,12 @@ if (host_os == "mac" && (target_os == "mac" || target_os == "ios")) {
201201
gen_snapshot_target =
202202
"$dart_src/runtime/bin:$gen_snapshot_target_name($build_toolchain)"
203203

204-
action(target_name) {
205-
script = "//flutter/sky/tools/cp.py"
206-
204+
copy(target_name) {
207205
# The toolchain-specific output directory. For cross-compiles, this is a
208206
# clang-x64 or clang-arm64 subdirectory of the top-level build directory.
209207
output_dir = get_label_info(gen_snapshot_target, "root_out_dir")
210208

211-
args = [
212-
rebase_path("${output_dir}/${gen_snapshot_target_name}"),
213-
rebase_path(
214-
"${root_out_dir}/artifacts_$host_cpu/gen_snapshot_${target_cpu}"),
215-
]
209+
sources = [ "${output_dir}/${gen_snapshot_target_name}" ]
216210
outputs =
217211
[ "${root_out_dir}/artifacts_$host_cpu/gen_snapshot_${target_cpu}" ]
218212
deps = [ gen_snapshot_target ]

sky/tools/cp.py

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)