Merge pull request #1077 from NativeScript/tachev/macos-snapshot-docker

feat: snapshot in Docker on macOS with Android runtime 6.3.0 or higher

Author: Dimitar Tachev

snapshot/android/project-snapshot-generator.js

@@ -179,7 +179,8 @@ ProjectSnapshotGenerator.prototype.generate = function (generationOptions) {
         androidNdkPath: generationOptions.androidNdkPath,
         mksnapshotParams: mksnapshotParams,
         snapshotInDocker: generationOptions.snapshotInDocker,
-        recommendedAndroidNdkRevision
+        recommendedAndroidNdkRevision,
+        runtimeVersion
     };
 
     return generator.generate(options).then(() => {

snapshot/android/snapshot-generator.js

@@ -4,6 +4,7 @@ const child_process = require("child_process");
 const { convertToUnixPath, warn } = require("../../lib/utils");
 const { isWindows } = require("./utils");
 const PropertiesReader = require('properties-reader');
+const semver = require("semver");
 const shelljs = require("shelljs");
 
 const { createDirectory, downloadFile, getHostOS, getHostOSArch, CONSTANTS, has32BitArch, isMacOSCatalinaOrHigher, isSubPath } = require("./utils");
@@ -37,12 +38,16 @@ module.exports = SnapshotGenerator;
 
 SnapshotGenerator.SNAPSHOT_PACKAGE_NANE = "nativescript-android-snapshot";
 
-SnapshotGenerator.prototype.shouldSnapshotInDocker = function (hostOS, targetArchs) {
+SnapshotGenerator.prototype.shouldSnapshotInDocker = function (hostOS, targetArchs, currentRuntimeVersion) {
     let shouldSnapshotInDocker = false;
+    const minRuntimeWithoutMacOSSnapshotTools = "6.3.0";
     const generateInDockerMessage = "The snapshots will be generated in a docker container.";
-    if (hostOS == CONSTANTS.WIN_OS_NAME) {
+    if (hostOS === CONSTANTS.WIN_OS_NAME) {
         console.log(`The V8 snapshot tools are not supported on Windows. ${generateInDockerMessage}`);
         shouldSnapshotInDocker = true;
+    } else if (hostOS === CONSTANTS.MAC_OS_NAME && semver.gte(currentRuntimeVersion, minRuntimeWithoutMacOSSnapshotTools)) {
+        console.log(`Starting from Android Runtime 6.3.0, the Snapshot tools are no longer supported on macOS. ${generateInDockerMessage}`);
+        shouldSnapshotInDocker = true;
     } else if (isMacOSCatalinaOrHigher() && has32BitArch(targetArchs)) {
         console.log(`Starting from macOS Catalina, the 32-bit processes are no longer supported. ${generateInDockerMessage}`);
         shouldSnapshotInDocker = true;
@@ -296,7 +301,7 @@ SnapshotGenerator.prototype.generate = function (options) {
 
     this.preprocessInputFiles(options.inputFiles, preprocessedInputFile);
     const hostOS = getHostOS();
-    const snapshotInDocker = options.snapshotInDocker || this.shouldSnapshotInDocker(hostOS, options.targetArchs);
+    const snapshotInDocker = options.snapshotInDocker || this.shouldSnapshotInDocker(hostOS, options.targetArchs, options.runtimeVersion);
 
     // generates the actual .blob and .c files
     return this.generateSnapshots(