Add flutter_tester binary to the CIPD package (flutter/engine#13143)

- Also unifies f/s/platorm/fuchsia:fuchsia as the only target we build.
- This should contain all the packages we need to build fuchsia.
This commit is contained in:
Kaushik Iska 2019-10-15 12:26:13 -07:00 committed by GitHub
parent 367931e589
commit 63e93b2f77
3 changed files with 15 additions and 9 deletions

View File

@ -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)",
]
}
}

View File

@ -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" ]
}
}
}

View File

@ -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)
def CopyToBucketWithMode(source, destination, aot, product, runner_type):
mode = 'aot' if aot else 'jit'
product_suff = '_product' if product else ''
@ -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):
@ -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