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

Add flutter_tester binary to the CIPD package #13143

Merged
iskakaushik merged 1 commit into from
Oct 15, 2019
Merged

Add flutter_tester binary to the CIPD package #13143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions shell/platform/fuchsia/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ if (using_fuchsia_sdk) {
"flutter:flutter_aot_${product_suffix}runner",
"flutter:flutter_jit_${product_suffix}runner",
"flutter:flutter_runner_tests",
"//flutter/shell/testing:testing($host_toolchain)",
]
}
}
8 changes: 6 additions & 2 deletions shell/testing/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,11 @@ executable("testing") {
"//third_party/tonic",
]

if (is_fuchsia && !is_fuchsia_sdk) {
deps += [ "//garnet/public/lib/ui/scenic:client" ]
if (is_fuchsia) {
if (!using_fuchsia_sdk) {
deps += [ "//garnet/public/lib/ui/scenic:client" ]
} else {
deps += [ "$fuchsia_sdk_root/pkg:scenic_cpp" ]
}
}
}
15 changes: 8 additions & 7 deletions tools/fuchsia/build_fuchsia_artifacts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,12 @@ def CopyGenSnapshotIfExists(source, destination):
destination_base, 'kernel_compiler.snapshot')


def CopyFlutterTesterBinIfExists(source, destination):
source_root = os.path.join(_out_dir, source)
destination_base = os.path.join(destination, 'flutter_binaries')
FindFileAndCopyTo('flutter_tester', source_root, destination_base)
Copy link
Member

@chinmaygarde chinmaygarde Oct 15, 2019

Choose a reason for hiding this comment

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

Can the path to the flutter_tester be explicitly specified? AFAIK, there are multiple Flutter tester binaries in the out out directory (a stripped and unstripped one).

Copy link
Contributor Author

@iskakaushik iskakaushik Oct 15, 2019

Choose a reason for hiding this comment

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

Good call, we currently do this for gen_snapshot and related binaries too. I am reworking packaging to account for debug symbols and multiple target hosts. Will fix it as a part of a follow up PR.

Currently, this should still get us to a place where we have all the binaries needed by Fuchsia so can remove the flutter/engine dep from topaz.



def CopyToBucketWithMode(source, destination, aot, product, runner_type):
mode = 'aot' if aot else 'jit'
product_suff = '_product' if product else ''
Expand All @@ -131,6 +137,7 @@ def CopyToBucketWithMode(source, destination, aot, product, runner_type):
if not os.path.exists(dest_sdk_path):
CopyPath(patched_sdk_dir, dest_sdk_path)
CopyGenSnapshotIfExists(source_root, destination)
CopyFlutterTesterBinIfExists(source_root, destination)


def CopyToBucket(src, dst, product=False):
Expand Down Expand Up @@ -185,13 +192,7 @@ def GetRunnerTarget(runner_type, product, aot):

def GetTargetsToBuild(product=False):
targets_to_build = [
# The Flutter Runner.
GetRunnerTarget('flutter', product, False),
GetRunnerTarget('flutter', product, True),
# The Dart Runner.
GetRunnerTarget('dart_runner', product, False),
GetRunnerTarget('dart_runner', product, True),
'%s/dart:kernel_compiler' % _fuchsia_base,
'flutter/shell/platform/fuchsia:fuchsia',
]
return targets_to_build

Expand Down