Merge pull request #9561 from garymathews/TIMOB-25441

[TIMOB-25441] Android: Support ARM64
tidev · Nov 7, 2017 · 130bf00 · 130bf00
2 parents 84e76eb + 1e08d9a
commit 130bf00
Show file tree

Hide file tree

Showing 12 changed files with 9 additions and 8 deletions.
diff --git a/android/build/libv8.properties b/android/build/libv8.properties
@@ -1,2 +1,2 @@
-libv8.version=6.1.534.33
+libv8.version=6.2.414.36
 libv8.mode=release
diff --git a/android/cli/commands/_build.js b/android/cli/commands/_build.js
@@ -73,7 +73,7 @@ function AndroidBuilder() {
 
 	this.targets = [ 'emulator', 'device', 'dist-playstore' ];
 
-	this.validABIs = [ 'armeabi-v7a', 'x86' ];
+	this.validABIs = [ 'arm64-v8a', 'armeabi-v7a', 'x86' ];
 
 	this.uncompressedTypes = [
 		'jpg', 'jpeg', 'png', 'gif',

diff --git a/android/runtime/v8/Application.mk b/android/runtime/v8/Application.mk
@@ -11,9 +11,9 @@ TARGET_PLATFORM = android-10
 APP_CPPFLAGS += -std=c++11
 APP_STL := c++_shared
 ifeq ($(BUILD_X86), 1)
-	APP_ABI := armeabi-v7a x86
+	APP_ABI := arm64-v8a armeabi-v7a x86
 else
-	APP_ABI := armeabi-v7a
+	APP_ABI := arm64-v8a armeabi-v7a
 endif
 
 TARGET_DEVICE := device

diff --git a/android/templates/module/default/template/android/manifest.ejs b/android/templates/module/default/template/android/manifest.ejs
@@ -4,7 +4,7 @@
 #
 version: 1.0.0
 apiversion: 4
-architectures: armeabi-v7a x86
+architectures: arm64-v8a armeabi-v7a x86
 description: <%- moduleName %>
 author: <%- author %>
 license: Specify your license

diff --git a/support/android/native/libs/arm64-v8a/libtiverify.so b/support/android/native/libs/arm64-v8a/libtiverify.so
diff --git a/support/android/native/libs/armeabi-v7a/.gitignore b/support/android/native/libs/armeabi-v7a/.gitignore
diff --git a/support/android/native/libs/armeabi-v7a/libtiprofiler.so b/support/android/native/libs/armeabi-v7a/libtiprofiler.so
diff --git a/support/android/native/libs/armeabi/.gitignore b/support/android/native/libs/armeabi/.gitignore
diff --git a/support/android/native/libs/armeabi/libtiprofiler.so b/support/android/native/libs/armeabi/libtiprofiler.so
diff --git a/support/android/native/libs/armeabi/libtiverify.so b/support/android/native/libs/armeabi/libtiverify.so
diff --git a/support/android/native/libs/x86/libtiprofiler.so b/support/android/native/libs/x86/libtiprofiler.so
diff --git a/support/module/packaged/modules.json b/support/module/packaged/modules.json
@@ -8,10 +8,11 @@
 		"https://github.com/appcelerator-modules/ti.touchid/releases/download/ios-2.1.2/ti.touchid-iphone-2.1.2.zip"
 	],
 	"android": [
-		"https://github.com/appcelerator-modules/ti.facebook/releases/download/android-6.2.0/facebook-android-6.2.0.zip",
+		"https://github.com/appcelerator-modules/ti.facebook/releases/download/android-7.0.0/facebook-android-7.0.0.zip",
 		"https://s3.amazonaws.com/timobile.appcelerator.com/modules/ti.cloudpush-android-4.0.4.zip",
-		"https://github.com/appcelerator-modules/ti.map/releases/download/android-3.3.1/ti.map-android-3.3.1.zip",
-		"https://github.com/appcelerator-modules/ti.touchid/releases/download/android-2.2.0/ti.touchid-android-2.2.0.zip"
+		"https://github.com/appcelerator-modules/ti.map/releases/download/android-4.0.0/ti.map-android-4.0.0.zip",
+		"https://github.com/appcelerator-modules/ti.touchid/releases/download/android-3.0.0/ti.touchid-android-3.0.0.zip",
+		"https://github.com/appcelerator-modules/ti.playservices/releases/download/android-11.0.40/ti.playservices-android-11.0.40.zip"
 	],
 	"commonjs": [
 		"https://github.com/appcelerator-modules/ti.cloud/releases/download/3.2.11/ti.cloud-commonjs-3.2.11.zip"