Fix targets in build_fuchsia_artifacts

Author: arbreng

tools/fuchsia/build_fuchsia_artifacts.py

@@ -221,15 +221,7 @@ def GetRunnerTarget(runner_type, product, aot):
   target += 'runner'
   return base + target
 
-
-def GetTargetsToBuild(product=False, additional_targets=[]):
-  targets_to_build = [
-      'flutter/shell/platform/fuchsia:fuchsia',
-  ] + additional_targets
-  return targets_to_build
-
-
-def BuildTarget(runtime_mode, arch, product, enable_lto, additional_targets=[]):
+def BuildTarget(runtime_mode, arch, enable_lto, build_tests, additional_targets=[]):
   out_dir = 'fuchsia_%s_%s' % (runtime_mode, arch)
   flags = [
       '--fuchsia',
@@ -243,7 +235,7 @@ def BuildTarget(runtime_mode, arch, product, enable_lto, additional_targets=[]):
     flags.append('--no-lto')
 
   RunGN(out_dir, flags)
-  BuildNinjaTargets(out_dir, GetTargetsToBuild(product))
+  BuildNinjaTargets(out_dir, [ 'flutter' ] + additional_targets)
 
   return
 
@@ -283,6 +275,12 @@ def main():
       default=False,
       help='If set, skips building and just creates packages.')
 
+  parser.add_argument(
+      '--build-tests',
+      action='store_true',
+      default=False,
+      help='If set, adds the test fars to the build.')
+
   parser.add_argument(
       '--targets',
       default='',
@@ -305,7 +303,7 @@ def main():
       product = product_modes[i]
       if build_mode == 'all' or runtime_mode == build_mode:
         if not args.skip_build:
-          BuildTarget(runtime_mode, arch, product, enable_lto,
+          BuildTarget(runtime_mode, arch, enable_lto, args.build_tests,
                       args.targets.split(","))
         BuildBucket(runtime_mode, arch, product)