From 08ee1c9fa6a55dd44151432d63e4a77a00b2d8d6 Mon Sep 17 00:00:00 2001 From: DimitarTachev Date: Fri, 27 Sep 2019 13:57:16 +0300 Subject: [PATCH] fix: fix xxd path for local snapshots generation --- snapshot/android/snapshot-generator.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/snapshot/android/snapshot-generator.js b/snapshot/android/snapshot-generator.js index 270524dc..9b87bd05 100644 --- a/snapshot/android/snapshot-generator.js +++ b/snapshot/android/snapshot-generator.js @@ -247,9 +247,9 @@ SnapshotGenerator.prototype.getSnapshotToolCommand = function (snapshotToolPath, return `${snapshotToolPath} ${inputFilePath} --startup_blob ${join(outputPath, `${SNAPSHOT_BLOB_NAME}.blob`)} ${toolParams}`; } -SnapshotGenerator.prototype.getXxdCommand = function (srcOutputDir) { +SnapshotGenerator.prototype.getXxdCommand = function (srcOutputDir, xxdLocation) { // https://github.com/NativeScript/docker-images/tree/master/v8-snapshot/bin - return `/bin/xxd -i ${SNAPSHOT_BLOB_NAME}.blob > ${join(srcOutputDir, `${SNAPSHOT_BLOB_NAME}.c`)}`; + return `${xxdLocation || ""}xxd -i ${SNAPSHOT_BLOB_NAME}.blob > ${join(srcOutputDir, `${SNAPSHOT_BLOB_NAME}.c`)}`; } SnapshotGenerator.prototype.getPathInDocker = function (mappedLocalDir, mappedDockerDir, targetPath) { @@ -309,7 +309,7 @@ SnapshotGenerator.prototype.buildCSource = function (androidArch, blobInputDir, if (snapshotInDocker) { const blobsInputInDocker = `/blobs/${androidArch}` const srcOutputDirInDocker = `/dist/src/${androidArch}`; - const buildCSourceCommand = this.getXxdCommand(srcOutputDirInDocker); + const buildCSourceCommand = this.getXxdCommand(srcOutputDirInDocker, "/bin/"); command = `docker run --rm -v "${blobInputDir}:${blobsInputInDocker}" -v "${srcOutputDir}:${srcOutputDirInDocker}" ${SNAPSHOTS_DOCKER_IMAGE} /bin/sh -c "cd ${blobsInputInDocker} && ${buildCSourceCommand}"`; } else {