From d426844f30b249ef153dbc15351f0af1861d54ff Mon Sep 17 00:00:00 2001
From: Kaushik Iska <kaushikiska@google.com>
Date: Wed, 4 Sep 2019 08:57:07 -0700
Subject: [PATCH 1/2] [flutter_runner] Add common libs to the test far

---
 shell/platform/fuchsia/flutter/BUILD.gn                      | 2 ++
 shell/platform/fuchsia/flutter/meta/flutter_runner_tests.cmx | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/shell/platform/fuchsia/flutter/BUILD.gn b/shell/platform/fuchsia/flutter/BUILD.gn
index 197921e98aa55..315afd12dbe2c 100644
--- a/shell/platform/fuchsia/flutter/BUILD.gn
+++ b/shell/platform/fuchsia/flutter/BUILD.gn
@@ -366,6 +366,8 @@ package_dir("flutter_runner_tests") {
 
   meta_dir = "$flutter_root/shell/platform/fuchsia/flutter/meta"
 
+  libraries = common_libs
+
   meta = [
     {
       path = "meta/$target_name.cmx"
diff --git a/shell/platform/fuchsia/flutter/meta/flutter_runner_tests.cmx b/shell/platform/fuchsia/flutter/meta/flutter_runner_tests.cmx
index 291ff3b4e76fc..e34607d563f5c 100644
--- a/shell/platform/fuchsia/flutter/meta/flutter_runner_tests.cmx
+++ b/shell/platform/fuchsia/flutter/meta/flutter_runner_tests.cmx
@@ -1,6 +1,6 @@
 {
     "program": {
-        "binary": "test/flutter_runner_tests"
+        "binary": "bin/app"
     },
     "sandbox": {
         "features": [

From 13cac48c381f25d588ae5f6deaceb818585c5f15 Mon Sep 17 00:00:00 2001
From: Kaushik Iska <kaushikiska@google.com>
Date: Wed, 4 Sep 2019 09:33:56 -0700
Subject: [PATCH 2/2] Add flutter runner test build as part of CI

---
 .cirrus.yml                      |  2 ++
 ci/build_flutter_runner_tests.sh | 17 +++++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100755 ci/build_flutter_runner_tests.sh

diff --git a/.cirrus.yml b/.cirrus.yml
index 427712d9da3c2..14537b2c7b1d2 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -75,6 +75,8 @@ task:
       compile_fuchsia_script: |
         cd $ENGINE_PATH/src
         ./flutter/tools/fuchsia/build_fuchsia_artifacts.py --engine-version HEAD --runtime-mode debug
+        cd $ENGINE_PATH/src/flutter
+        ./ci/build_flutter_runner_tests.sh
 
 # WINDOWS
 task:
diff --git a/ci/build_flutter_runner_tests.sh b/ci/build_flutter_runner_tests.sh
new file mode 100755
index 0000000000000..eaf098dd0dbcf
--- /dev/null
+++ b/ci/build_flutter_runner_tests.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+set -ex
+
+PATH="$HOME/depot_tools:$PATH"
+cd ..
+
+# Build the flutter runner tests far directory
+flutter/tools/gn --fuchsia --no-lto --runtime-mode debug
+ninja -C out/fuchsia_debug_x64 flutter/shell/platform/fuchsia/flutter:flutter_runner_tests
+
+# Generate the far package
+flutter/tools/fuchsia/gen_package.py\
+  --pm-bin $PWD/fuchsia/sdk/linux/tools/pm\
+  --package-dir $PWD/out/fuchsia_debug_x64/flutter_runner_tests_far\
+  --signing-key $PWD/flutter/tools/fuchsia/development.key\
+  --far-name flutter_runner_tests
+