diff --git a/snapshot/android/snapshot-generator.js b/snapshot/android/snapshot-generator.js index dac5e4cf..c7481f2e 100644 --- a/snapshot/android/snapshot-generator.js +++ b/snapshot/android/snapshot-generator.js @@ -2,6 +2,7 @@ const fs = require("fs"); const { dirname, relative, join, EOL } = require("path"); const child_process = require("child_process"); const { convertToUnixPath, warn } = require("../../lib/utils"); +const { isWindows } = require("./utils"); const PropertiesReader = require('properties-reader'); const shelljs = require("shelljs"); @@ -209,7 +210,7 @@ SnapshotGenerator.prototype.buildSnapshotLibs = function (androidNdkPath, recomm } SnapshotGenerator.prototype.getAndroidNdkBuildPath = function (androidNdkPath, recommendedAndroidNdkRevision) { - const ndkBuildExecutableName = "ndk-build"; + const ndkBuildExecutableName = isWindows() ? "ndk-build.cmd" : "ndk-build"; let hasNdk = false; // fallback for Android Runtime < 6.2.0 with the 6.1.0 value recommendedAndroidNdkRevision = recommendedAndroidNdkRevision || "20.0.5594570"; diff --git a/snapshot/android/utils.js b/snapshot/android/utils.js index aef7157b..947f0302 100644 --- a/snapshot/android/utils.js +++ b/snapshot/android/utils.js @@ -60,6 +60,10 @@ function isMacOSCatalinaOrHigher() { return isCatalinaOrHigher; } +function isWindows() { + return getHostOS() === CONSTANTS.WIN_OS_NAME; +} + const downloadFile = (url, destinationFilePath, timeout) => new Promise((resolve, reject) => { getRequestOptions(url, timeout) @@ -119,5 +123,6 @@ module.exports = { isMacOSCatalinaOrHigher, downloadFile, getJsonFile, - isSubPath + isSubPath, + isWindows };