Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Copy the Flutter Runner from //topaz into the engine. #8886

Merged
merged 3 commits into from
May 8, 2019

Conversation

chinmaygarde
Copy link
Member

Build rules and include paths have been updated as necessary.
No other functional change.

@chinmaygarde
Copy link
Member Author

After babysitting all rollers, I have verified that patches in all dependencies have been rolled into DEPS.

@jason-simmons
Copy link
Member

There are still various references to "topaz" in include guards, GN files, etc.

Build rules and include paths have been updated as necessary.
No other functional change.
@chinmaygarde
Copy link
Member Author

I fixed the guards and licenses. The remaining references are in files that need to be updated one the packaging templates are ported.

Copy link
Member

@cbracken cbracken left a comment

Choose a reason for hiding this comment

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

{RS}LGTM in modulo the fixes.

main(List<String> args) async {
if (args.length != 1) {
print("Usage:\n"
" fx syslog | dart topaz/runtime/flutter_runner/collect_traces.dart output.txt");
Copy link
Member

Choose a reason for hiding this comment

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

Is this correct?

import("//third_party/dart/build/dart/dart_action.gni")
import("//topaz/runtime/dart/config.gni")
import("//topaz/runtime/dart/dart_component.gni")
import("//topaz/runtime/dart/dart_kernel.gni")
Copy link
Member

Choose a reason for hiding this comment

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

Fix these

after startup from a few apps.

To update this trace.
- In //topaz/runtime/flutter_runner/engine.cc, change kCompilationTraceDelayInSeconds to a non-zero value.
Copy link
Member

Choose a reason for hiding this comment

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

Here and below: update path.

// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#include "topaz/runtime/flutter_runner/fuchsia_font_manager.h"
Copy link
Member

Choose a reason for hiding this comment

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

shell/...

import("//third_party/dart/utils/compile_platform.gni")
import("//topaz/runtime/dart/dart_component.gni")
import("//topaz/runtime/dart/dart_kernel.gni")
import("//topaz/runtime/flutter_runner/prebuilt_framework.gni")
Copy link
Member

Choose a reason for hiding this comment

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

Here and below: update

@@ -0,0 +1,164 @@
{
"comment:0": "NOTE: THIS FILE IS GENERATED. DO NOT EDIT.",
"comment:1": "Instead modify 'topaz/runtime/flutter_runner/kernel/libraries.yaml' and follow the instructions therein.",
Copy link
Member

Choose a reason for hiding this comment

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

Regenerate (and fix the generator if this is hardcoded -- I assume it's not...)

#
# python third_party/dart/tools/yaml2json.py \
# topaz/runtime/flutter_runner/kernel/libraries.yaml \
# topaz/runtime/flutter_runner/kernel/libraries.json
Copy link
Member

Choose a reason for hiding this comment

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

And here and below.

@chinmaygarde chinmaygarde merged commit 0b406c3 into flutter:master May 8, 2019
@chinmaygarde chinmaygarde deleted the fdk_land_flutter_runner branch May 8, 2019 00:24
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request May 8, 2019
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request May 8, 2019
engine-flutter-autoroll added a commit to flutter/flutter that referenced this pull request May 8, 2019
flutter/engine@149b7b8...0fc6efb

git log 149b7b8..0fc6efb --no-merges --oneline
0fc6efb Roll src/third_party/dart a8b6e18b62..8143450941 (11 commits)
93d1c37 Remove absolute path in new Fuchsia SDK based runner target dependency. (flutter/engine#8888)
0b406c3 Copy the Flutter Runner from //topaz into the engine. (flutter/engine#8886)
2b1f992 new lints (flutter/engine#8849)
0c7a3f2 Copy //dart-pkg/zircon|fuchsia from Topaz into the engine. (flutter/engine#8884)
ba82ea2 Roll src/third_party/skia 056944747072..51e15a69ce5b (8 commits) (flutter/engine#8885)
d717044 Copy //runtime/dart/utils from Topaz into the engine. (flutter/engine#8871)

The AutoRoll server is located here: https://autoroll.skia.org/r/flutter-engine-flutter-autoroll

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, please contact the current sheriff (chinmaygarde@google.com), and stop
the roller if necessary.
huqiuser pushed a commit to huqiuser/engine that referenced this pull request Jun 12, 2019
Build rules and include paths have been updated as necessary.
No other functional change.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
4 participants