Update mksnapshot uploads

John Kleinschmidt · MarshallOfSound · commit 8df703a13b5d · 2018-09-28T11:18:25.000+10:00
diff --git a/script/upload.py b/script/upload.py
@@ -16,7 +16,7 @@
                        get_zip_name
 from lib.util import get_electron_branding, execute, get_electron_version, \
                      parse_version, scoped_cwd, s3put, get_electron_exec, \
-                     get_out_dir
+                     get_out_dir, GN_SRC_DIR
 
 
 ELECTRON_REPO = 'electron/electron'
@@ -91,13 +91,20 @@ def main():
   chromedriver_zip = os.path.join(OUT_DIR, chromedriver)
   shutil.copy2(os.path.join(OUT_DIR, 'chromedriver.zip'), chromedriver_zip)
   upload_electron(release, chromedriver_zip, args)
-  mksnapshot = get_zip_name('mksnapshot', ELECTRON_VERSION)
-  upload_electron(release, os.path.join(OUT_DIR, mksnapshot), args)
 
+  mksnapshot = get_zip_name('mksnapshot', ELECTRON_VERSION)
+  mksnapshot_zip = os.path.join(OUT_DIR, mksnapshot)
   if get_target_arch().startswith('arm'):
+    # Upload the native mksnapshot as mksnapshot.zip
+    shutil.copy2(os.path.join(GN_SRC_DIR, 'out', 'native_mksnapshot',
+                              'native_mksnapshot.zip'), mksnapshot_zip)
+    upload_electron(release, mksnapshot_zip, args)
     # Upload the x64 binary for arm/arm64 mksnapshot
     mksnapshot = get_zip_name('mksnapshot', ELECTRON_VERSION, 'x64')
-    upload_electron(release, os.path.join(OUT_DIR, mksnapshot), args)
+    mksnapshot_zip = os.path.join(OUT_DIR, mksnapshot)
+
+  shutil.copy2(os.path.join(OUT_DIR, 'mksnapshot.zip'), mksnapshot_zip)
+  upload_electron(release, mksnapshot_zip, args)
 
   if not tag_exists and not args.upload_to_s3:
     # Upload symbols to symbol server.
