Merge pull request #1125 from NativeScript/tachev/fix-ndk-warning

Dimitar Tachev · web-flow · commit 25238ffd9e11 · 2020-02-12T14:01:08.000+02:00
fix: `The provided Android NDK is vnull while the recommended one is v21.0.6113669` error in some cases
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nativescript-dev-webpack",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "main": "index",
   "description": "",
   "homepage": "http://www.telerik.com",
@@ -100,4 +100,4 @@
     "tns-core-modules": "next",
     "typescript": "~3.5.3"
   }
-}
+}
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
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "nativescript-dev-webpack",`
`3`		`- "version": "1.5.0",`
	`3`	`+ "version": "1.5.1",`
`4`	`4`	`"main": "index",`
`5`	`5`	`"description": "",`
`6`	`6`	`"homepage": "http://www.telerik.com",`
`@@ -100,4 +100,4 @@`
`100`	`100`	`"tns-core-modules": "next",`
`101`	`101`	`"typescript": "~3.5.3"`
`102`	`102`	`}`
`103`		`-}`
	`103`	`+}`
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) {`