fix: The provided Android NDK is vnull while the recommended one is v21.0.6113669 error in some cases

DimitarTachev · DimitarTachev · commit 23aa6c564b32 · 2020-02-12T13:51:31.000+02:00
diff --git a/snapshot/android/snapshot-generator.js b/snapshot/android/snapshot-generator.js
@@ -400,7 +400,11 @@ SnapshotGenerator.prototype.buildCSource = function (androidArch, blobInputDir,
 }
 
 SnapshotGenerator.prototype.getRecommendedNdkWarning = function (localNdkRevision, recommendedAndroidNdkRevision) {
-    return `The provided Android NDK is v${localNdkRevision} while the recommended one is v${recommendedAndroidNdkRevision}`;
+    if (localNdkRevision) {
+        return `The provided Android NDK is v${localNdkRevision} while the required one is v${recommendedAndroidNdkRevision}`;
+    } else {
+        return `The provided Android NDK version is different than the required one - v${recommendedAndroidNdkRevision}`;
+    }
 }
 
 SnapshotGenerator.prototype.runMksnapshotTool = function (tool, mksnapshotParams, inputFile, snapshotInDocker, snapshotToolsPath, buildCSource) {

Original file line number	Diff line number	Diff line change
`@@ -400,7 +400,11 @@ SnapshotGenerator.prototype.buildCSource = function (androidArch, blobInputDir,`
`400`	`400`	`}`
`401`	`401`
`402`	`402`	`SnapshotGenerator.prototype.getRecommendedNdkWarning = function (localNdkRevision, recommendedAndroidNdkRevision) {`
`403`		- return `The provided Android NDK is v${localNdkRevision} while the recommended one is v${recommendedAndroidNdkRevision}`;
	`403`	`+ if (localNdkRevision) {`
	`404`	+ return `The provided Android NDK is v${localNdkRevision} while the required one is v${recommendedAndroidNdkRevision}`;
	`405`	`+ } else {`
	`406`	+ return `The provided Android NDK version is different than the required one - v${recommendedAndroidNdkRevision}`;
	`407`	`+ }`
`404`	`408`	`}`
`405`	`409`
`406`	`410`	`SnapshotGenerator.prototype.runMksnapshotTool = function (tool, mksnapshotParams, inputFile, snapshotInDocker, snapshotToolsPath, buildCSource) {`