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

[fuchsia] Migrate from custom FuchsiaFontManager to SkFontMgr_fuchsia#10700

Merged
jason-simmons merged 1 commit intoflutter:masterfrom
kpozin:flutter-remove-skfontmg-2019-08-02
Aug 9, 2019
Merged

[fuchsia] Migrate from custom FuchsiaFontManager to SkFontMgr_fuchsia#10700
jason-simmons merged 1 commit intoflutter:masterfrom
kpozin:flutter-remove-skfontmg-2019-08-02

Conversation

@kpozin
Copy link
Contributor

@kpozin kpozin commented Aug 7, 2019

Use Skia's own implementation of SkFontMgr for Fuchsia, for consistency with
other Skia clients on Fuchsia.

FL-290

@kpozin
Copy link
Contributor Author

kpozin commented Aug 7, 2019

Getting the following error in CI (https://cirrus-ci.com/task/5777028429643776)

============================= ERROR =============================
License script got different results than expected for out/license_script_output/licenses_flutter.
Please rerun the licenses script locally to verify that it is
correctly catching any new licenses for anything you may have
changed, and then update this file:
  flutter/sky/packages/sky_engine/LICENSE
For more information, see the script in:
  https://github.com/flutter/engine/tree/master/tools/licenses

--- flutter/ci/licenses_golden/licenses_flutter	2019-08-07 18:51:42.846279382 +0000
+++ out/license_script_output/licenses_flutter	2019-08-07 18:55:00.791394978 +0000

When I run flutter/ci/licenses.sh locally, I get

Computing signature for license tool
Collecting licenses for flutter
      1105 of 1105 ██████████ 100% (0 missing licenses)  Done.
Collecting licenses for fuchsia
    Skipping this component - no change in signature
Collecting licenses for third_party
    Skipping this component - no change in signature
Collecting licenses for skia
    Skipping this component - no change in signature
Verifying license tool signature...
Checking license count in licenses_flutter...
Licenses are as expected.

I would, however, expect a change in licenses_fuchsia.

Any idea what's going wrong?

@jason-simmons
Copy link
Member

jason-simmons commented Aug 7, 2019

Do the shell/platform/fuchsia/flutter/fuchsia_font_manager* files exist in the filesystem where you are running the licenses.sh script?

If they have been removed locally, then the output in out/license_script_output should not include paths to those files. You can also manually remove the fuchsia_font_manager paths from ci/licenses_golden/licenses_flutter and resubmit the PR to Cirrus.

@kpozin
Copy link
Contributor Author

kpozin commented Aug 7, 2019

Thanks, fixed the license files.

There are also these failures in web_test, which don't seem related to my change.

@kpozin kpozin marked this pull request as ready for review August 8, 2019 00:54
@kpozin
[fuchsia] Migrate from custom FuchsiaFontManager to SkFontMgr_fuchsia
dedee3a 
Use Skia's own implementation of SkFontMgr for Fuchsia, for consistency with
other Skia clients on Fuchsia.

FL-290
@jason-simmons jason-simmons merged commit 70de3ec into flutter:master Aug 9, 2019
@kpozin kpozin deleted the flutter-remove-skfontmg-2019-08-02 branch August 9, 2019 18:05
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Aug 9, 2019
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Aug 9, 2019
@engine-flutter-autoroll
70de3ec [fuchsia] Migrate from custom FuchsiaFontManager to SkFontMgr…
874f0ff 
…_fuchsia (flutter/engine#10700)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Aug 9, 2019
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Aug 9, 2019
@engine-flutter-autoroll
70de3ec [fuchsia] Migrate from custom FuchsiaFontManager to SkFontMgr…
3e4db99 
…_fuchsia (flutter/engine#10700)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Aug 9, 2019
@engine-flutter-autoroll
70de3ec [fuchsia] Migrate from custom FuchsiaFontManager to SkFontMgr…
2c4d1c5 
…_fuchsia (flutter/engine#10700)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Aug 9, 2019
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Aug 9, 2019
@engine-flutter-autoroll
70de3ec [fuchsia] Migrate from custom FuchsiaFontManager to SkFontMgr…
1a00337 
…_fuchsia (flutter/engine#10700)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Aug 9, 2019
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Aug 9, 2019
@engine-flutter-autoroll
70de3ec [fuchsia] Migrate from custom FuchsiaFontManager to SkFontMgr…
7d484c5 
…_fuchsia (flutter/engine#10700)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Aug 9, 2019
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Aug 9, 2019
@engine-flutter-autoroll
70de3ec [fuchsia] Migrate from custom FuchsiaFontManager to SkFontMgr…
8013a00 
…_fuchsia (flutter/engine#10700)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Aug 9, 2019
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Aug 9, 2019
@engine-flutter-autoroll
70de3ec [fuchsia] Migrate from custom FuchsiaFontManager to SkFontMgr…
13163ac 
…_fuchsia (flutter/engine#10700)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Aug 9, 2019
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Aug 9, 2019
@engine-flutter-autoroll
70de3ec [fuchsia] Migrate from custom FuchsiaFontManager to SkFontMgr…
adfa77f 
…_fuchsia (flutter/engine#10700)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Aug 9, 2019
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Aug 9, 2019
@engine-flutter-autoroll
70de3ec [fuchsia] Migrate from custom FuchsiaFontManager to SkFontMgr…
4631095 
…_fuchsia (flutter/engine#10700)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Aug 9, 2019
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Aug 9, 2019
@engine-flutter-autoroll
70de3ec [fuchsia] Migrate from custom FuchsiaFontManager to SkFontMgr…
eabe913 
…_fuchsia (flutter/engine#10700)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Aug 9, 2019
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Aug 9, 2019
@engine-flutter-autoroll
70de3ec [fuchsia] Migrate from custom FuchsiaFontManager to SkFontMgr…
addca01 
…_fuchsia (flutter/engine#10700)
This was referenced Aug 13, 2019
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Merged
@stuartmorgan-g stuartmorgan-g mentioned this pull request Aug 13, 2019
Merged
9 tasks
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

1 more reviewer

@jason-simmons jason-simmons jason-simmons approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

cla: yes

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@kpozin @jason-simmons @googlebot