From eb22f11f688317321360ed492ea2f16f5a38dbdb Mon Sep 17 00:00:00 2001 From: Kaushik Iska Date: Thu, 25 Jul 2019 16:20:44 -0700 Subject: [PATCH] [fucshia] fix name to reflect the cmx file (flutter/engine#10151) * [fucshia] fix name to reflect the cmx file * uncomment --- .../src/flutter/tools/fuchsia/build_fuchsia_artifacts.py | 7 ++++--- .../tools/fuchsia/gather_flutter_runner_artifacts.py | 8 ++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/engine/src/flutter/tools/fuchsia/build_fuchsia_artifacts.py b/engine/src/flutter/tools/fuchsia/build_fuchsia_artifacts.py index 3b460928632..ae8a9ede821 100755 --- a/engine/src/flutter/tools/fuchsia/build_fuchsia_artifacts.py +++ b/engine/src/flutter/tools/fuchsia/build_fuchsia_artifacts.py @@ -86,12 +86,13 @@ def CopyFiles(source, destination): def CopyToBucket(source, destination, product=False): - far_dir = 'flutter_jit_runner_far' + runner_name = 'flutter_jit_runner' if product: - far_dir = 'flutter_jit_product_runner_far' + runner_name = 'flutter_jit_product_runner' + far_dir = '%s_far' % runner_name source_root = os.path.join(_out_dir, source) source = os.path.join(source_root, far_dir) - CreateMetaPackage(source) + CreateMetaPackage(source, runner_name) pm_bin = GetPMBinPath() key_path = os.path.join(_script_dir, 'development.key') diff --git a/engine/src/flutter/tools/fuchsia/gather_flutter_runner_artifacts.py b/engine/src/flutter/tools/fuchsia/gather_flutter_runner_artifacts.py index cc55aeaa55a..aec641f76d9 100755 --- a/engine/src/flutter/tools/fuchsia/gather_flutter_runner_artifacts.py +++ b/engine/src/flutter/tools/fuchsia/gather_flutter_runner_artifacts.py @@ -40,13 +40,13 @@ def CopyPath(src, dst): raise -def CreateMetaPackage(dst_root): +def CreateMetaPackage(dst_root, far_name): meta = os.path.join(dst_root, 'meta') if not os.path.isdir(meta): os.makedirs(meta) content = {} - content['name'] = 'flutter_runner' - content['version'] = '0.0.1' + content['name'] = far_name + content['version'] = '0' package = os.path.join(meta, 'package') with open(package, 'w') as out_file: json.dump(content, out_file) @@ -67,7 +67,7 @@ def GatherArtifacts(src_root, dst_root, create_meta_package=True): CopyPath(src_full, dst_full) if create_meta_package: - CreateMetaPackage(dst_root) + CreateMetaPackage(dst_root, 'flutter_runner') def main():