commit | a47af325050462a678cfe958cbc9b87e1edd6f56 | [log] [tgz] |
---|---|---|
author | Alexander Biggs <akbiggs@google.com> | Mon Sep 19 02:20:04 2022 +0000 |
committer | Alexander Biggs <akbiggs@google.com> | Mon Sep 19 02:29:43 2022 +0000 |
tree | 45c111ac705dbee095f30d3f5bc80144ed98b508 | |
parent | cac07797dc706228784a4a3c007daf97dcaa0f20 [diff] |
[embedder] Fix sync_engine_artifacts_to_revision.sh. The issue was that: 1. inspect_node_fix was no longer able to be cherry-picked. This means that fxb/75282 was taking effect which makes the Dart VM serve the component context on our app's behalf which leads to us being unable to serve the component context ourselves. 2. inspect_node_fix was no longer able to be cherrypicked because it wasn't hosted on a branch (https://github.com/akbiggs/engine/commit/3b8de94b1347d2f7c3e5e33933866ba8140abdc1), and maybe eventually those commits get cleaned up. I rehosted it on a branch (https://github.com/akbiggs/engine/commit/3cbcbb20321f6cda60d28ebc8c2e0b2da285a58d) and confirmed that none of the other fixes have this issue. 3. The fetch error was silently ignored because of `set +e`. I got rid of that in favor of `|| true` on `git remote add`. Change-Id: Ic38e58280a388e9ee0dcd3455a5c37941e8d1278 Tested: Ran `build_and_run_example.sh hello_flutter` with the new libflutter_engine.so, it runs fine.
The Flutter Embedder for Fuchsia is a new in-progress runtime for Flutter apps on Fuchsia. This runtime is built on top of Flutter's embedder platform.
This repository is a work in progress and should be considered experimental.
If you're using WSL (Windows Subsystem for Linux), see SETUP_WINDOWS.md first.
Set $FUCHSIA_EMBEDDER_DIR
to your flutter-embedder.git checkout location, for example ~/flutter-embedder
.
export FUCHSIA_EMBEDDER_DIR=$HOME/flutter-embedder
Bootstrap the repository's dependencies:
$FUCHSIA_EMBEDDER_DIR/scripts/bootstrap.sh
This script initializes tools (including bazel
and ffx
), installs some Git hooks and downloads the workstation_eng.qemu-x64
product bundle, which you can use to run the examples below.
Start the emulator.
If running in a graphical environment:
$FUCHSIA_EMBEDDER_DIR/tools/ffx emu start workstation_eng.qemu-x64
If running in a terminal environment:
$FUCHSIA_EMBEDDER_DIR/tools/ffx emu start --headless workstation_eng.qemu-x64
Set the default target in ffx to be fuchsia-emulator
:
$FUCHSIA_EMBEDDER_DIR/tools/ffx target default set fuchsia-emulator
(optional) Watch the device log in a separate window:
$FUCHSIA_EMBEDDER_DIR/tools/ffx log
Run an example app:
$FUCHSIA_EMBEDDER_DIR/scripts/build_and_run_example.sh hello_flutter
TODO(akbiggs): The app occasionally gets stuck on a loading screen instead of rendering. Re-running the app usually fixes it. We need to fix this.
Occasionally you will need to update the Flutter Engine artifacts (embedder.h
and libengine_flutter.so
) that are used by the embedder to run Flutter apps. A script is provided for this workflow.
You will need to get the Flutter Engine source code. Note that this is not just cloning https://github.com/flutter/engine.
Set $ENGINE_DIR
to the src
folder of your Flutter Engine checkout location, for example ~/engine/src
.
$DEPOT_TOOLS
should be set to your depot_tools
location, for example ~/depot_tools
.
For sync_engine_artifacts_to_revision.sh
, you will need to git stash
or git commit
any local changes to the Flutter Engine. This is not necesssary for build_and_copy_engine_artifacts.sh
.
You can run the script with a flutter/engine
Git commit to sync the Engine artifacts to that revision.
$FUCHSIA_EMBEDDER_DIR/scripts/sync_engine_artifacts_to_revision.sh <ENGINE_COMMIT_SHA>
A common workflow is to sync your Engine commit to the Flutter tool in this repository, for example when updating the Flutter tool to a new version. To do this:
$FUCHSIA_EMBEDDER_DIR/scripts/sync_engine_artifacts_to_revision.sh $(cat $FUCHSIA_EMBEDDER_DIR/third_party/dart-pkg/internal/flutter/flutter/bin/internal/engine.version)
If you want to test local changes to the Engine, you can run build_and_copy_engine_artifacts.sh
instead, which simply builds and copies your Engine into $FUCHSIA_EMBEDDER_DIR
.
$FUCHSIA_EMBEDDER_DIR/scripts/build_and_copy_engine_artifacts.sh
flutter-embedder reviews are handled using Gerrit at https://fuchsia-review.googlesource.com, which uses a single commit per code review. See this guide for an intro to Gerrit.
An alternative Gerrit workflow is a branchless workflow where you do all your work from origin/main
without creating new branches. We describe such a workflow below, but it‘s not mandatory, it’s just provided as an example.
An example branchless workflow for creating a new change is:
# Start work from an up-to-date main branch. git fetch origin git checkout origin/main # Modify some files... ... # Stage and commit your changes. git add file1.cc file2.h git commit -m "[embedder] My cool new feature." # Upload for review. git push origin HEAD:refs/for/main
An example branchless workflow to apply feedback during a code review is:
Visit https://fuchsia-review.googlesource.com and find your change.
Select ... > Download patch > Checkout
and copy the command.
Run the following commands:
# Start from main with your change on top. <paste the command you copied above> # Make some changes to some files to apply the feedback... ... # Stage and amend your changes to your commit. git add file1.cc file2.h git commit --amend # Upload your updated change for review. git push origin HEAD:refs/for/main
An example branchless workflow to create a chain of changes is:
# Start work from an up-to-date main branch. git fetch origin git checkout origin/main # Modify some files... ... # Stage and commit your changes. git add file1.cc file2.h git commit -m "[embedder] My cool new feature 1." # Upload for review. git push origin HEAD:refs/for/main # Do some more work on top of your cool new feature. git add file3.cc file4.h git commit -m "[embedder] My cool new feature 2." # Create a second code review for your second feature. # The second code review will only show changes for # your second feature and it will indicate that it is based on # top of the first feature. git push origin HEAD:refs/for/main
A branchless workflow comes with some benefits:
git checkout origin/main
).However a branchless workflow also prevents you from storing multiple chains of commits locally. Uploading your changes to https://fuchsia-review.googlesource.com frequently can help address that problem, as https://fuchsia-review.googlesource.com then acts as the storage for each of your ongoing changes. This also keeps your changes in a state where they're easy to share and hand off to other people.