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
merged 20 commits into from
Nov 14, 2022
Merged

Archive windows gen_snapshot.exe. #35414

merged 20 commits into from
Nov 14, 2022

Conversation

godofredoc
Copy link
Contributor

This is required to enable engine_v2 recipes for windows platform.

Bug: flutter/flutter#81855

Pre-launch Checklist

  • I read the Contributor Guide and followed the process outlined there for submitting PRs.
  • I read the Tree Hygiene wiki page, which explains my responsibilities.
  • I read and followed the Flutter Style Guide and the C++, Objective-C, Java style guides.
  • I listed at least one issue that this PR fixes in the description above.
  • I added new tests to check the change I am making or feature I am adding, or Hixie said the PR is test-exempt. See testing the engine for instructions on
    writing and running engine tests.
  • I updated/added relevant documentation (doc comments with ///).
  • I signed the CLA.
  • All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-new channel on Discord.

@godofredoc godofredoc requested review from zanderso and dnfield August 16, 2022 16:32
@@ -22,6 +22,9 @@ declare_args() {

# Whether to use a prebuilt Dart SDK instead of building one.
flutter_prebuilt_dart_sdk = false

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

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

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

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 ;-)

if (is_win) {
zip_bundle("archive_win_gen_snapshot") {
deps = [ "//third_party/dart/runtime/bin:gen_snapshot" ]
output = "$target_platform_name-$android_cpu-$flutter_runtime_mode/windows-x64.zip"
Copy link
Member

Choose a reason for hiding this comment

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

@pbo-linaro is working on adding Arm64 support to Windows (see flutter/flutter#62597 and #35962). Do we need to anything for arm64 artifacts here?

Copy link
Contributor

Choose a reason for hiding this comment

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

dart-sdk for windows-arm64 is building fine (previous work before flutter), so that could be nice to prepare this part in this PR if possible.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is also covering windows arm64.

@godofredoc godofredoc removed the Work in progress (WIP) Not ready (yet) for review! label Nov 14, 2022
@godofredoc
Copy link
Contributor Author

@zanderso this is complete and ready for review.

godofredoc and others added 3 commits November 14, 2022 08:17
Co-authored-by: Zachary Anderson <[email protected]>
Co-authored-by: Zachary Anderson <[email protected]>
Co-authored-by: Zachary Anderson <[email protected]>
@godofredoc
Copy link
Contributor Author

Validated that new changes are working correctly end to end: https://chromium-swarm.appspot.com/task?id=5e9019bbf8ad6310

Copy link
Member

@zanderso zanderso left a comment

Choose a reason for hiding this comment

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

LGTM!

@godofredoc godofredoc added the autosubmit Merge PR when tree becomes green via auto submit App label Nov 14, 2022
@auto-submit auto-submit bot merged commit 965f87d into flutter:main Nov 14, 2022
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Nov 14, 2022
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Nov 14, 2022
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Nov 15, 2022
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Nov 15, 2022
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Nov 15, 2022
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Nov 15, 2022
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Nov 15, 2022
auto-submit bot pushed a commit to flutter/flutter that referenced this pull request Nov 15, 2022
…115335)

* 6976132e5 [web] Switch to doubles (flutter/engine#37336)

* c3d7c5967 Roll Skia from a434f9b69660 to 33c62dafffc9 (9 revisions) (flutter/engine#37598)

* 91656a5ff Avoid segfault when converting no-op ColorFilter to ImageFilter (flutter/engine#37596)

* 965f87d31 Archive windows gen_snapshot.exe. (flutter/engine#35414)

* 16dba68e5 [Impeller] Only apply the rrect blur fast path for solid Colors (flutter/engine#37594)

* d366183c0 Roll Dart SDK from 7cbcf48157cf to 6f5478a58387 (2 revisions) (flutter/engine#37597)

* 88f56870b Roll Fuchsia Linux SDK from dRHIZSishiboEHMdw... to B0OuUvWOY24LI1WoF... (flutter/engine#37603)

* 28eeba518 [Multiwindow, macOS] FlutterCompositor::Present receives view_id (flutter/engine#37391)

* 8d815657c Roll Skia from 33c62dafffc9 to b474a43dcc34 (6 revisions) (flutter/engine#37606)

* 78ae24140 Revert "[web] Switch to doubles (#37336)" (flutter/engine#37609)
schwa423 pushed a commit to schwa423/engine that referenced this pull request Nov 16, 2022
* Archive windows gen_snapshot.exe.

This is required to enable engine_v2 recipes for windows platform.

Bug: flutter/flutter#81855

* Add dep to generate gen_snapshot.exe.

* Use target platform name rather than host.

* Use prebuilt_arch.

* Use platform_name instead of is_win.

* Remove android check.

* Fix output name.

* Separate platform and cpu in name.

* Remove failing line.

* Use dart_target_arch rather than target_cpu in windows.

* Add dart_target_arch to scope.

* Add support for android_cpu.

* Fix android_cpu variable name.

* Rebase to ToT

* Try to use target cpu directly.

* Use host os instead of is_win.

* Build engine artifacts for win.

* Update build/archives/BUILD.gn

Co-authored-by: Zachary Anderson <[email protected]>

* Update build/archives/BUILD.gn

Co-authored-by: Zachary Anderson <[email protected]>

* Update build/archives/BUILD.gn

Co-authored-by: Zachary Anderson <[email protected]>

Co-authored-by: Zachary Anderson <[email protected]>
shogohida pushed a commit to shogohida/flutter that referenced this pull request Dec 7, 2022
…lutter#115335)

* 6976132e5 [web] Switch to doubles (flutter/engine#37336)

* c3d7c5967 Roll Skia from a434f9b69660 to 33c62dafffc9 (9 revisions) (flutter/engine#37598)

* 91656a5ff Avoid segfault when converting no-op ColorFilter to ImageFilter (flutter/engine#37596)

* 965f87d31 Archive windows gen_snapshot.exe. (flutter/engine#35414)

* 16dba68e5 [Impeller] Only apply the rrect blur fast path for solid Colors (flutter/engine#37594)

* d366183c0 Roll Dart SDK from 7cbcf48157cf to 6f5478a58387 (2 revisions) (flutter/engine#37597)

* 88f56870b Roll Fuchsia Linux SDK from dRHIZSishiboEHMdw... to B0OuUvWOY24LI1WoF... (flutter/engine#37603)

* 28eeba518 [Multiwindow, macOS] FlutterCompositor::Present receives view_id (flutter/engine#37391)

* 8d815657c Roll Skia from 33c62dafffc9 to b474a43dcc34 (6 revisions) (flutter/engine#37606)

* 78ae24140 Revert "[web] Switch to doubles (flutter#37336)" (flutter/engine#37609)
gspencergoog pushed a commit to gspencergoog/flutter that referenced this pull request Jan 19, 2023
…lutter#115335)

* 6976132e5 [web] Switch to doubles (flutter/engine#37336)

* c3d7c5967 Roll Skia from a434f9b69660 to 33c62dafffc9 (9 revisions) (flutter/engine#37598)

* 91656a5ff Avoid segfault when converting no-op ColorFilter to ImageFilter (flutter/engine#37596)

* 965f87d31 Archive windows gen_snapshot.exe. (flutter/engine#35414)

* 16dba68e5 [Impeller] Only apply the rrect blur fast path for solid Colors (flutter/engine#37594)

* d366183c0 Roll Dart SDK from 7cbcf48157cf to 6f5478a58387 (2 revisions) (flutter/engine#37597)

* 88f56870b Roll Fuchsia Linux SDK from dRHIZSishiboEHMdw... to B0OuUvWOY24LI1WoF... (flutter/engine#37603)

* 28eeba518 [Multiwindow, macOS] FlutterCompositor::Present receives view_id (flutter/engine#37391)

* 8d815657c Roll Skia from 33c62dafffc9 to b474a43dcc34 (6 revisions) (flutter/engine#37606)

* 78ae24140 Revert "[web] Switch to doubles (flutter#37336)" (flutter/engine#37609)
@godofredoc godofredoc deleted the archive_win_gen branch March 8, 2023 16:10
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
autosubmit Merge PR when tree becomes green via auto submit App
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants