From 0d2a8464387583190633079820622787a261f28f Mon Sep 17 00:00:00 2001 From: rosen-vladimirov Date: Tue, 20 Aug 2019 13:42:27 +0300 Subject: [PATCH 1/4] chore: bump version to 1.1.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7421d2e5..e9a591e4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nativescript-dev-webpack", - "version": "1.1.0", + "version": "1.1.1", "main": "index", "description": "", "homepage": "http://www.telerik.com", From 65d5d3f98720c5042b39f3aa1b3b8e7f2cf09869 Mon Sep 17 00:00:00 2001 From: rosen-vladimirov Date: Tue, 20 Aug 2019 13:39:03 +0300 Subject: [PATCH 2/4] fix: add ia64 as supported architecture Add ia64 as supported architecture and map it to x86_64 Android arch. --- plugins/NativeScriptSnapshotPlugin/options.json | 6 ++++-- snapshot/android/project-snapshot-generator.js | 2 +- snapshot/android/snapshot-generator.js | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/plugins/NativeScriptSnapshotPlugin/options.json b/plugins/NativeScriptSnapshotPlugin/options.json index 513afd4e..f18a2cd9 100644 --- a/plugins/NativeScriptSnapshotPlugin/options.json +++ b/plugins/NativeScriptSnapshotPlugin/options.json @@ -28,14 +28,16 @@ "default": [ "arm", "arm64", - "ia32" + "ia32", + "ia64" ], "items": { "type": "string", "enum": [ "arm", "arm64", - "ia32" + "ia32", + "ia64" ] } }, diff --git a/snapshot/android/project-snapshot-generator.js b/snapshot/android/project-snapshot-generator.js index be5ef1f3..ed29d72f 100644 --- a/snapshot/android/project-snapshot-generator.js +++ b/snapshot/android/project-snapshot-generator.js @@ -239,7 +239,7 @@ ProjectSnapshotGenerator.prototype.generate = function (generationOptions) { const options = { snapshotToolsPath, - targetArchs: generationOptions.targetArchs || ["arm", "arm64", "ia32"], + targetArchs: generationOptions.targetArchs || ["arm", "arm64", "ia32", "ia64"], v8Version: generationOptions.v8Version || v8Version, preprocessedInputFile: generationOptions.preprocessedInputFile, useLibs: generationOptions.useLibs || false, diff --git a/snapshot/android/snapshot-generator.js b/snapshot/android/snapshot-generator.js index 8c177809..8ff97eb6 100644 --- a/snapshot/android/snapshot-generator.js +++ b/snapshot/android/snapshot-generator.js @@ -53,7 +53,7 @@ SnapshotGenerator.prototype.preprocessInputFiles = function (inputFiles, outputF // Example: // (function() { // some code here - // })() + // })() // // sourceMapUrl...... // ** when we join without `;` here, the next IIFE is assumed as a function call to the result of the first IIFE // (function() { @@ -101,6 +101,7 @@ SnapshotGenerator.prototype.convertToAndroidArchName = function (archName) { case "arm": return "armeabi-v7a"; case "arm64": return "arm64-v8a"; case "ia32": return "x86"; + case "ia64": return "x86_64"; case "x64": return "x64"; default: return archName; } From f97c8f76f0641d6a8c14fdb67a443b4cad551bda Mon Sep 17 00:00:00 2001 From: rosen-vladimirov Date: Tue, 20 Aug 2019 15:03:25 +0300 Subject: [PATCH 3/4] fix: use ia64 only if runtime is 6.0.2 or later Older runtimes cannot work with ia64 arch (they do not have the x86_64 arch), so check the runtime version and remove the ia64 (and all new archs that we may add in the future). --- snapshot/android/project-snapshot-generator.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/snapshot/android/project-snapshot-generator.js b/snapshot/android/project-snapshot-generator.js index ed29d72f..a208024f 100644 --- a/snapshot/android/project-snapshot-generator.js +++ b/snapshot/android/project-snapshot-generator.js @@ -237,9 +237,18 @@ ProjectSnapshotGenerator.prototype.generate = function (generationOptions) { throw new Error(noV8VersionFoundMessage); } + // NOTE: Order is important! Add new archs at the end of the array + const defaultTargetArchs = ["arm", "arm64", "ia32", "ia64"]; + const runtimeVersion = getAndroidRuntimeVersion(this.options.projectRoot); + if (runtimeVersion && semver.lt(semver.coerce(runtimeVersion), "6.0.2")) { + const indexOfIa64 = defaultTargetArchs.indexOf("ia64"); + // Before 6.0.2 version of Android runtime we supported only arm, arm64 and ia32. + defaultTargetArchs.splice(indexOfIa64, defaultTargetArchs.length - indexOfIa64); + } + const options = { snapshotToolsPath, - targetArchs: generationOptions.targetArchs || ["arm", "arm64", "ia32", "ia64"], + targetArchs: generationOptions.targetArchs || defaultTargetArchs, v8Version: generationOptions.v8Version || v8Version, preprocessedInputFile: generationOptions.preprocessedInputFile, useLibs: generationOptions.useLibs || false, From 797b77c4be1b07c064d0f3367a951d1196c496c2 Mon Sep 17 00:00:00 2001 From: rosen-vladimirov Date: Tue, 20 Aug 2019 15:22:54 +0300 Subject: [PATCH 4/4] chore: remove unused x64 arch coversion --- snapshot/android/snapshot-generator.js | 1 - 1 file changed, 1 deletion(-) diff --git a/snapshot/android/snapshot-generator.js b/snapshot/android/snapshot-generator.js index 8ff97eb6..4de65fa6 100644 --- a/snapshot/android/snapshot-generator.js +++ b/snapshot/android/snapshot-generator.js @@ -102,7 +102,6 @@ SnapshotGenerator.prototype.convertToAndroidArchName = function (archName) { case "arm64": return "arm64-v8a"; case "ia32": return "x86"; case "ia64": return "x86_64"; - case "x64": return "x64"; default: return archName; } }