From df685726a44f7e21f1329e4d4161039754259ef2 Mon Sep 17 00:00:00 2001 From: khanhduytran0 Date: Tue, 15 Sep 2020 17:05:27 +0700 Subject: [PATCH] Enable arm64 for testing --- app/build.gradle | 4 ++-- app/src/main/jni/Application.mk | 4 ++-- .../arm64-v8a/libgl04es.so | Bin .../arm64-v8a/liblwjgl.so | Bin .../arm64-v8a/liblwjgl_opengl.so | Bin .../arm64-v8a/liblwjgl_stb.so | Bin 6 files changed, 4 insertions(+), 4 deletions(-) rename app/src/main/{jniLibs_disabled => jniLibs}/arm64-v8a/libgl04es.so (100%) rename app/src/main/{jniLibs_disabled => jniLibs}/arm64-v8a/liblwjgl.so (100%) rename app/src/main/{jniLibs_disabled => jniLibs}/arm64-v8a/liblwjgl_opengl.so (100%) rename app/src/main/{jniLibs_disabled => jniLibs}/arm64-v8a/liblwjgl_stb.so (100%) diff --git a/app/build.gradle b/app/build.gradle index 4e61149f1..92c8419cc 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -24,11 +24,11 @@ android { minSdkVersion 21 targetSdkVersion 26 versionCode 156235 - versionName "3.2.0_6402b_20200910" + versionName "3.2.0_6403b_20200915" multiDexEnabled true //important ndk { - abiFilters "armeabi-v7a" + abiFilters "arm64-v8a", "armeabi-v7a" } } diff --git a/app/src/main/jni/Application.mk b/app/src/main/jni/Application.mk index c1c040a55..097423999 100644 --- a/app/src/main/jni/Application.mk +++ b/app/src/main/jni/Application.mk @@ -1,5 +1,5 @@ # NDK_TOOLCHAIN_VERSION := 4.9 APP_PLATFORM := android-21 APP_STL := system -APP_ABI := armeabi-v7a -# x86 arm64-v8a x86_64 +APP_ABI := armeabi-v7a arm64-v8a +# x86 x86_64 diff --git a/app/src/main/jniLibs_disabled/arm64-v8a/libgl04es.so b/app/src/main/jniLibs/arm64-v8a/libgl04es.so similarity index 100% rename from app/src/main/jniLibs_disabled/arm64-v8a/libgl04es.so rename to app/src/main/jniLibs/arm64-v8a/libgl04es.so diff --git a/app/src/main/jniLibs_disabled/arm64-v8a/liblwjgl.so b/app/src/main/jniLibs/arm64-v8a/liblwjgl.so similarity index 100% rename from app/src/main/jniLibs_disabled/arm64-v8a/liblwjgl.so rename to app/src/main/jniLibs/arm64-v8a/liblwjgl.so diff --git a/app/src/main/jniLibs_disabled/arm64-v8a/liblwjgl_opengl.so b/app/src/main/jniLibs/arm64-v8a/liblwjgl_opengl.so similarity index 100% rename from app/src/main/jniLibs_disabled/arm64-v8a/liblwjgl_opengl.so rename to app/src/main/jniLibs/arm64-v8a/liblwjgl_opengl.so diff --git a/app/src/main/jniLibs_disabled/arm64-v8a/liblwjgl_stb.so b/app/src/main/jniLibs/arm64-v8a/liblwjgl_stb.so similarity index 100% rename from app/src/main/jniLibs_disabled/arm64-v8a/liblwjgl_stb.so rename to app/src/main/jniLibs/arm64-v8a/liblwjgl_stb.so