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

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

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
23aa6c5
fix: `The provided Android NDK is vnull while the recommended one is …
DimitarTachev Feb 12, 2020
45ef004
chore: bump version
DimitarTachev Feb 12, 2020
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
Next Next commit
fix: `The provided Android NDK is vnull while the recommended one is … 
…v21.0.6113669` error in some cases
  • Loading branch information
@DimitarTachev
DimitarTachev committed Feb 12, 2020
commit 23aa6c564b32f20a3b3f040dee509d68b8f3b916
6 changes: 5 additions & 1 deletion snapshot/android/snapshot-generator.js
View file
Open in desktop
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