Use different targets for mksnapshot and native_mksnapshot

mksnapshot gets built in electron_app as part of the v8 build, so copy it from there

.circleci/config.yml

@@ -324,8 +324,7 @@ steps-native-mksnapshot-build: &steps-native-mksnapshot-build
         name: native mksnapshot (arm/arm64) build
         command: |
           cd src
-          ninja -C out/native_mksnapshot electron:electron_mksnapshot_zip
-          cp out/native_mksnapshot/mksnapshot.zip out/native_mksnapshot/native_mksnapshot.zip
+          ninja -C out/native_mksnapshot electron:electron_native_mksnapshot_zip          
     - store_artifacts:
         path: src/out/native_mksnapshot/native_mksnapshot.zip
         destination: native_mksnapshot

BUILD.gn

@@ -880,6 +880,17 @@ copy("chromium_licenses") {
     "$root_build_dir/LICENSES.chromium.html",
   ]
 }
+copy("electron_mksnapshot_copy") {
+  sources = []
+  if (is_win) {
+    sources += "mksnapshot.exe",
+  } else {
+    sources += "mksnapshot",
+  }
+  outputs = [
+    "$root_build_dir/{{source_file_part}}",
+  ]
+}
 
 group("licenses") {
   data_deps = [
@@ -927,12 +938,23 @@ dist_zip("electron_chromedriver_zip") {
 }
 
 dist_zip("electron_mksnapshot_zip") {
+  # mksnapshot gets built in electron_app as part of the v8 build, so copy it from there
+  data_deps = [
+    ":electron_mksnapshot_copy",
+    ":licenses",
+  ]
+  outputs = [
+    "$root_build_dir/mksnapshot.zip",
+  ]
+}
+
+dist_zip("electron_native_mksnapshot_zip") {
   data_deps = [
     "//v8:mksnapshot",
     ":licenses",
   ]
   outputs = [
-    "$root_build_dir/mksnapshot.zip",
+    "$root_build_dir/native_mksnapshot.zip",
   ]
 }