Add SkyShell.app to the Mac artifacts.zip

scripts/slave/recipes/flutter/engine.py

 # Copyright 2016 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import contextlib
 
 DEPS = [
   'depot_tools/bot_update',
   'depot_tools/gclient',
   'file',
@@ skipping 28 matching lines @@
   gn_cmd.extend(args)
   api.step('gn %s' % ' '.join(args), gn_cmd)
 
 
 def AddFiles(api, pkg, relative_paths):
   for path in relative_paths:
     pkg.add_file(pkg.root.join(path), archive_name=api.path.basename(path))
 
 
 def UploadArtifacts(api, platform, file_paths, archive_name='artifacts.zip'):
-  with MakeTempDir(api) as temp_dir:
+  dir_label = '%s UploadArtifacts %s' % (platform, archive_name)
+  with MakeTempDir(api, dir_label) as temp_dir:
     local_zip = temp_dir.join('artifacts.zip')
     remote_name = '%s/%s' % (platform, archive_name)
     remote_zip = GetCloudPath(api, remote_name)
     pkg = api.zip.make_package(api.path['checkout'], local_zip)
     AddFiles(api, pkg, file_paths)
 
-    pkg.zip('Zip %s Artifacts' % platform)
+    pkg.zip('Zip %s %s' % (platform, archive_name))
     api.gsutil.upload(local_zip, BUCKET_NAME, remote_zip,
         name='upload "%s"' % remote_name)
 
 
 def UploadDartPackage(api, package_name):
-  with MakeTempDir(api) as temp_dir:
+  dir_label = 'UploadDartPackage %s' % package_name
+  with MakeTempDir(api, dir_label) as temp_dir:
     local_zip = temp_dir.join('%s.zip' % package_name)
     remote_name = '%s.zip' % package_name
     remote_zip = GetCloudPath(api, remote_name)
     parent_dir = api.path['checkout'].join(
         'out/android_debug/dist/packages')
     pkg = api.zip.make_package(parent_dir, local_zip)
     pkg.add_directory(parent_dir.join(package_name))
     pkg.zip('Zip %s Package' % package_name)
     api.gsutil.upload(local_zip, BUCKET_NAME, remote_zip,
         name='upload %s' % remote_name)
 
 
 # TODO(eseidel): Would be nice to have this on api.path or api.file.
 @contextlib.contextmanager
-def MakeTempDir(api):
+def MakeTempDir(api, label):
   try:
     temp_dir = api.path.mkdtemp('tmp')
     yield temp_dir
   finally:
-    api.file.rmtree('temp dir', temp_dir)
+    api.file.rmtree('temp dir for %s' % label, temp_dir)
 
 
 def AnalyzeDartUI(api):
   RunGN(api, '--unoptimized')
   Build(api, 'host_debug_unopt', 'generate_dart_ui')
 
   checkout = api.path['checkout']
   api.step('analyze dart_ui', ['/bin/sh', 'travis/analyze.sh'], cwd=checkout)
 
 
 def BuildLinuxAndroidx86(api):
   for x86_variant, abi in [('x64', 'x86_64'), ('x86', 'x86')]:
     RunGN(api, '--android', '--android-cpu=' + x86_variant)
     out_dir = 'android_debug_' + x86_variant
     Build(api, out_dir)
-    UploadArtifacts(api, 'android-' + x86_variant, [
+    folder = 'android-' + x86_variant
+    UploadArtifacts(api, folder, [
       'build/android/ant/chromium-debug.keystore',
       'out/%s/apks/SkyShell.apk' % out_dir,
       ('out/%s/gen/sky/shell/shell/shell/libs/%s/libsky_shell.so' %
        (out_dir, abi)),
       'out/%s/icudtl.dat' % out_dir,
       'out/%s/gen/sky/shell/shell/classes.dex.jar' % out_dir,
     ])
+    UploadArtifacts(api, folder, [
+      'out/%s/libsky_shell.so' % out_dir
+    ], archive_name='symbols.zip')
 
 
 def AddPathPrefix(api, prefix, paths):
   return map(lambda path: api.path.join(prefix, path), paths)
 
 
 def BuildLinuxAndroidArm(api):
   out_paths = [
     'apks/SkyShell.apk',
     'flutter.jar',
     'flutter.mojo',
     'gen/sky/shell/shell/shell/libs/armeabi-v7a/libsky_shell.so',
     'icudtl.dat',
     'gen/sky/shell/shell/classes.dex.jar',
   ]
   RunGN(api, '--android', '--enable-gcm')
   Build(api, 'android_debug', ':dist', 'gcm')
   UploadArtifacts(api, 'android-arm', [
     'build/android/ant/chromium-debug.keystore',
   ] + AddPathPrefix(api, 'out/android_debug', out_paths))
+  UploadArtifacts(api, 'android-arm', [
+      'out/android_debug/libsky_shell.so'
+  ], archive_name='symbols.zip')
 
   # Build and upload engines for the runtime modes that use AOT compilation.
   for runtime_mode in ['profile', 'release']:
     build_output_dir = 'android_' + runtime_mode
     upload_dir = 'android-arm-' + runtime_mode
 
     RunGN(api, '--android', '--runtime-mode=' + runtime_mode)
     Build(api, build_output_dir)
 
     UploadArtifacts(api, upload_dir, [
       'build/android/ant/chromium-debug.keystore',
       'dart/runtime/bin/dart_io_entries.txt',
       'sky/engine/bindings/dart_vm_entry_points.txt',
       'sky/engine/bindings/dart_vm_entry_points_android.txt',
     ] + AddPathPrefix(api, 'out/%s' % build_output_dir, out_paths))
 
     # Upload artifacts used for AOT compilation on Linux hosts.
     UploadArtifacts(api, upload_dir, [
       'out/%s/clang_x86/gen_snapshot' % build_output_dir,
     ], archive_name='linux-x64.zip')
+    UploadArtifacts(api, 'upload_dir', [
+        'out/%s/libsky_shell.so' % build_output_dir
+    ], archive_name='symbols.zip')
 
   UploadDartPackage(api, 'sky_engine')
   UploadDartPackage(api, 'sky_services')
 
   def UploadService(name, out_dir):
     def Upload(from_path, to_path):
       api.gsutil.upload(from_path, BUCKET_NAME, GetCloudPath(api, to_path),
           name='upload %s' % api.path.basename(to_path))
 
     def ServicesOut(path):
@@ skipping 152 matching lines @@
       BuildIOS(api)
 
 
 def GenTests(api):
   # A valid commit to flutter/engine, to make the gsutil urls look real.
   for platform in ('mac', 'linux'):
     yield (api.test(platform) + api.platform(platform, 64)
         + api.properties(mastername='client.flutter',
               buildername='%s Engine' % platform.capitalize(),
               slavename='fake-m1', clobber=''))