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

Conversation

@stuartmorgan-g
Copy link
Contributor

Replaces third_party/zlib, which was originally forked from Chromium,
with the latest copy from Chromium.

BUILD.gn contains some changes to build in our buildroot without
cascading changes:

  • Removes the build_with_chromium sections.
  • Removes optimization configuration adjustments that rely on
    buildroot-wide configuration options that are newer than our fork
    (removing default optimization settings, max_speed)
  • Removes an is_nacl condition, adds a previously-locally-added
    is_fuchsia check.

This is needed to allow the Chromium zlib additions added in
#373 to build correctly.

Replaces third_party/zlib, which was originally forked from Chromium,
with the latest copy from Chromium.

BUILD.gn contains some changes to build in our buildroot without
cascading changes:
- Removes the `build_with_chromium` sections.
- Removes optimization configuration adjustments that rely on
  buildroot-wide configuration options that are newer than our fork
  (removing default optimization settings, max_speed)
- Removes an is_nacl condition, adds a previously-locally-added
  is_fuchsia check.
@stuartmorgan-g
Copy link
Contributor Author

I'm not sure how I missed that the additional files I added before had a compile error against our older copy of zlib.

Rather than continue to cherry-pick bits and pieces, it seemed better to just pull a full updated copy from Chromium.

stuartmorgan-g added a commit to stuartmorgan-g/engine that referenced this pull request Jul 28, 2020
Pulls in flutter/buildroot#385 for build fix. (Will need license updates.)
Copy link
Member

@chinmaygarde chinmaygarde left a comment

Choose a reason for hiding this comment

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

Rather than continue to cherry-pick bits and pieces, it seemed better to just pull a full updated copy from Chromium.

Sounds good. I didn't eyeball the whole patch. Happy to take a closer look at any part you point me to but otherwise lgtm.

@stuartmorgan-g
Copy link
Contributor Author

Looks like this will require some non-trivial license updates (i.e., script, not just file path lists) so I'm making a separate roll PR for it (flutter/engine#20119) rather than rolling it as part of the ANGLE roll PR as originally planned.

@stuartmorgan-g stuartmorgan-g merged commit 92f0936 into master Jul 29, 2020
@stuartmorgan-g stuartmorgan-g deleted the zlib-update-from-chromium branch July 29, 2020 21:00
chinmaygarde pushed a commit to chinmaygarde/flutter_buildroot that referenced this pull request May 4, 2021
* Update third_party/zlib from Chromium

Replaces third_party/zlib, which was originally forked from Chromium,
with the latest copy from Chromium.

BUILD.gn contains some changes to build in our buildroot without
cascading changes:
- Removes the `build_with_chromium` sections.
- Removes optimization configuration adjustments that rely on
  buildroot-wide configuration options that are newer than our fork
  (removing default optimization settings, max_speed)
- Removes an is_nacl condition, adds a previously-locally-added
  is_fuchsia check.
- Adjusts path for Android cpu_features build dependency, which is
  different in Flutter
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants