Merge pull request #1448 from NativeScript/darind/x86_64

Added x86_64 architecture

Author: darind

CHANGELOG.md

@@ -1,3 +1,10 @@
+6.0.2
+==
+
+## What's New
+
+- [Include x86_64 architecture](https://github.com/NativeScript/android-runtime/issues/1419)
+
 6.0.1
 ==
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "tns-android",
   "description": "NativeScript Runtime for Android",
-  "version": "6.0.1",
+  "version": "6.0.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/NativeScript/android-runtime.git"

test-app/app/build.gradle

@@ -229,7 +229,7 @@ android {
             if (onlyX86) {
                 abiFilters 'x86'
             } else {
-                abiFilters 'x86', 'armeabi-v7a', 'arm64-v8a'
+                abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
             }
         }
         dexOptions {

test-app/app/src/main/assets/app/modules/libCalc-arm.so

@@ -10,9 +10,11 @@ describe("Tests native modules)", function () {
 		if (lcArch.indexOf("arm") > -1) {
 			arch = "arm";
 		} else if (lcArch.indexOf("aarch64") > -1) {
-		    arch = (com.tns.Runtime.getPointerSize() == 4) ? "arm" : "arm64";
+			arch = (com.tns.Runtime.getPointerSize() == 4) ? "arm" : "arm64";
 		} else if (lcArch.indexOf("i686") > -1) {
 			arch = "x86";
+		} else if (lcArch.indexOf("x86_64") > -1) {
+			arch = "x86_64";
 		} else {
 			throw new Error("Unsupported architecture=" + sysArch);
 		}

test-app/app/src/main/assets/app/modules/libCalc-arm64.so

@@ -203,9 +203,10 @@ MESSAGE(STATUS "# CMAKE_CXX_FLAGS: " ${CMAKE_CXX_FLAGS})
 target_link_libraries(NativeScript ${PROJECT_SOURCE_DIR}/src/main/libs/${ANDROID_ABI}/libzip.a)
 target_link_libraries(NativeScript ${PROJECT_SOURCE_DIR}/src/main/libs/${ANDROID_ABI}/libv8.a)
 
-if("${ANDROID_ABI}" MATCHES "armeabi-v7a" OR "${ANDROID_ABI}" MATCHES "x86")
+if("${ANDROID_ABI}" MATCHES "armeabi-v7a$" OR "${ANDROID_ABI}" MATCHES "x86$")
     # On API Level 19 and lower we need to link with android_support
     # because it contains some implementation of functions such as "strtoll" and "strtoul"
+    MESSAGE(STATUS "# Linking with libandroid_support.a")
     target_link_libraries(NativeScript ${ANDROID_NDK_ROOT}/sources/cxx-stl/llvm-libc++/libs/${ANDROID_ABI}/libandroid_support.a)
 endif()
 

test-app/app/src/main/assets/app/modules/libCalc-x86.so

@@ -75,7 +75,7 @@ android {
             if (onlyX86) {
                 abiFilters 'x86'
             } else {
-                abiFilters 'x86', 'armeabi-v7a', 'arm64-v8a'
+                abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
             }
         }
     }