Skip to content
This repository was archived by the owner on Aug 7, 2021. It is now read-only.

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

Merged
merged 2 commits into from
Feb 12, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nativescript-dev-webpack",
"version": "1.5.0",
"version": "1.5.1",
"main": "index",
"description": "",
"homepage": "http://www.telerik.com",
Expand Down Expand Up @@ -100,4 +100,4 @@
"tns-core-modules": "next",
"typescript": "~3.5.3"
}
}
}
6 changes: 5 additions & 1 deletion snapshot/android/snapshot-generator.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down