ARM64 support.

I haven't run any unit tests or anything, but the created artifact works with our apps.
eclipsesource · Jan 22, 2018 · 7f1c832 · 7f1c832
1 parent d70acda
commit 7f1c832
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 3 deletions.
diff --git a/build_system/build_configs.py b/build_system/build_configs.py
@@ -27,6 +27,15 @@
                   "node_enabled": True,
             },
       },
+      {
+            "name": "android-arm64 @ Docker",
+            "params": {
+                  "target": c.target_android,
+                  "arch": c.arch_arm64,
+                  "docker": True,
+                  "node_enabled": True,
+            },
+      },
       # ALPINE LINUX builds
       {
             "name": "alpine-linux-x64 @ Docker",

diff --git a/build_system/build_constants.py b/build_system/build_constants.py
@@ -63,4 +63,5 @@
     c.arch_x86,
     c.arch_x64,
     c.arch_arm,
+    c.arch_arm64
 ]
diff --git a/build_system/config_android.py b/build_system/config_android.py
@@ -5,7 +5,7 @@
 import build_utils as b
 import cmake_utils as cmu
 
-android_config = PlatformConfig(c.target_android, [c.arch_x86, c.arch_arm])
+android_config = PlatformConfig(c.target_android, [c.arch_x86, c.arch_arm, c.arch_arm64])
 
 android_config.set_cross_configs({
     "docker": DockerBuildStep(
@@ -21,7 +21,8 @@
 
 android_config.set_file_abis({
     c.arch_arm: "armeabi-v7a",
-    c.arch_x86: "x86"
+    c.arch_x86: "x86",
+    c.arch_arm64: "arm64-v8a"
 })
 
 #-----------------------------------------------------------------------

diff --git a/build_system/constants.py b/build_system/constants.py
@@ -13,6 +13,7 @@
 arch_x86 = 'x86'
 arch_x64 = 'x64'
 arch_arm = 'arm'
+arch_arm64 = 'arm64'
 
 # atomic build-steps
 build_node_js = 'nodejs'

diff --git a/jni/Application.mk b/jni/Application.mk
@@ -1,3 +1,3 @@
-APP_ABI := armeabi-v7a x86
+APP_ABI := armeabi-v7a x86 arm64-v8a
 APP_PLATFORM := android-15
 APP_STL=gnustl_static