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

Archive windows gen_snapshot.exe. #35414

Merged
auto-submit merged 20 commits into from
Nov 14, 2022
Merged

Archive windows gen_snapshot.exe. #35414

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
56e4e4a
Archive windows gen_snapshot.exe.
godofredoc Aug 15, 2022
a420497
Add dep to generate gen_snapshot.exe.
godofredoc Aug 15, 2022
6beb5f3
Use target platform name rather than host.
godofredoc Aug 15, 2022
76c0ed1
Use prebuilt_arch.
godofredoc Aug 15, 2022
8c7b9d1
Use platform_name instead of is_win.
godofredoc Aug 16, 2022
1c7c55b
Remove android check.
godofredoc Aug 16, 2022
28dde2c
Fix output name.
godofredoc Aug 16, 2022
58946c4
Separate platform and cpu in name.
godofredoc Aug 16, 2022
6476c1e
Remove failing line.
godofredoc Aug 16, 2022
5e8075f
Use dart_target_arch rather than target_cpu in windows.
godofredoc Aug 16, 2022
34c6458
Add dart_target_arch to scope.
godofredoc Aug 16, 2022
74775c8
Add support for android_cpu.
godofredoc Aug 16, 2022
fe04472
Fix android_cpu variable name.
godofredoc Aug 16, 2022
5167ef2
Rebase to ToT
godofredoc Nov 10, 2022
05598a7
Try to use target cpu directly.
godofredoc Nov 10, 2022
d186259
Use host os instead of is_win.
godofredoc Nov 12, 2022
3307d80
Build engine artifacts for win.
godofredoc Nov 12, 2022
b05e233
Update build/archives/BUILD.gn
godofredoc Nov 14, 2022
3414a76
Update build/archives/BUILD.gn
godofredoc Nov 14, 2022
2944b79
Update build/archives/BUILD.gn
godofredoc Nov 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add support for android_cpu.
  • Loading branch information
@godofredoc
godofredoc committed Nov 10, 2022
commit 74775c8cbf8b68444d906ddeb895055d874e0dc0
2 changes: 1 addition & 1 deletion build/archives/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ if (is_mac) {
if (is_win) {
zip_bundle("archive_win_gen_snapshot") {
deps = [ "//third_party/dart/runtime/bin:gen_snapshot" ]
output = "$target_platform_name-$dart_target_arch-$flutter_runtime_mode/windows-x64.zip"
output = "$target_platform_name-$android-cpu-$flutter_runtime_mode/windows-x64.zip"
files = [
{
source = "$root_out_dir/gen_snapshot.exe"
Expand Down
4 changes: 2 additions & 2 deletions common/config.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ declare_args() {
# Whether to use a prebuilt Dart SDK instead of building one.
flutter_prebuilt_dart_sdk = false

# The dart target architecture.
dart_target_arch = "arm"
# The android cpu used to generate windows artifacts.
android_cpu = "arm"
Copy link
Member

@zanderso zanderso Aug 17, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't seem quite right. I need some time to investigate.

Copy link
Member

@zanderso zanderso Aug 17, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems like this workaround would be a continuation of this hack:

engine/tools/gn

Line 289 in 4b32f2e

# No cross-compilation on Windows (for now). Use host toolchain that

Instead of going further in this direction, we should try to remove the hack. (Added/expanded on here #3883 cc @rmacnak-google)

Copy link
Member

@zanderso zanderso Nov 7, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Following #37125, I think android_cpu is no longer needed, and target_cpu can be used. But I haven't actually tried it myself ;-)

}

# feature_defines_list ---------------------------------------------------------
Expand Down
Loading