NativeScript · vmutafov · Aug 20, 2019 · Aug 20, 2019
diff --git a/test-app/app/build.gradle b/test-app/app/build.gradle
@@ -232,7 +232,7 @@ android {
             if (onlyX86) {
                 abiFilters 'x86'
             } else {
-                abiFilters 'x86', 'armeabi-v7a', 'arm64-v8a'
+                abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
             }
         }
         dexOptions {

diff --git a/test-app/app/src/main/assets/app/modules/libCalc-x86_64.so b/test-app/app/src/main/assets/app/modules/libCalc-x86_64.so
diff --git a/test-app/app/src/main/assets/app/tests/testNativeModules.js b/test-app/app/src/main/assets/app/tests/testNativeModules.js
@@ -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);
 		}

diff --git a/test-app/runtime/CMakeLists.txt b/test-app/runtime/CMakeLists.txt
@@ -206,9 +206,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()
 

diff --git a/test-app/runtime/build.gradle b/test-app/runtime/build.gradle
@@ -75,7 +75,7 @@ android {
             if (onlyX86) {
                 abiFilters 'x86'
             } else {
-                abiFilters 'x86', 'armeabi-v7a', 'arm64-v8a'
+                abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
             }
         }
     }

diff --git a/test-app/runtime/src/main/libs/arm64-v8a/libzip.a b/test-app/runtime/src/main/libs/arm64-v8a/libzip.a
diff --git a/test-app/runtime/src/main/libs/armeabi-v7a/libzip.a b/test-app/runtime/src/main/libs/armeabi-v7a/libzip.a
diff --git a/test-app/runtime/src/main/libs/x86/libzip.a b/test-app/runtime/src/main/libs/x86/libzip.a
diff --git a/test-app/runtime/src/main/libs/x86_64/include/natives_blob.h b/test-app/runtime/src/main/libs/x86_64/include/natives_blob.h
diff --git a/test-app/runtime/src/main/libs/x86_64/include/snapshot_blob.h b/test-app/runtime/src/main/libs/x86_64/include/snapshot_blob.h
diff --git a/test-app/runtime/src/main/libs/x86_64/libv8.a b/test-app/runtime/src/main/libs/x86_64/libv8.a
diff --git a/test-app/runtime/src/main/libs/x86_64/libzip.a b/test-app/runtime/src/main/libs/x86_64/libzip.a