Merge branch 'newAndroidApkVersionSchemeForMultiArchSupport' into 'master'

New android apk version scheme for multi arch support

See merge request !207

RocketChatMobileModular.pro

@@ -7,7 +7,7 @@ contains(ANDROID_TARGET_ARCH,armeabi-v7a) {
         $$PWD/openssl/android-arm/libcrypto.so \
         $$PWD/openssl/android-arm/libssl.so
 }
-contains(ANDROID_TARGET_ARCH,armeabi-v8a) {
+contains(ANDROID_TARGET_ARCH,arm64-v8a) {
     ANDROID_EXTRA_LIBS = \
         $$PWD/../openssl/android-arm64/libssl.so \
         $$PWD/../openssl/android-arm64/libcrypto.so
@@ -17,6 +17,16 @@ contains(ANDROID_TARGET_ARCH,) {
         $$PWD/../openssl/android-arm64/libssl.so \
         $$PWD/../openssl/android-arm64/libcrypto.so
 }
+contains(ANDROID_TARGET_ARCH,x86) {
+    ANDROID_EXTRA_LIBS = \
+        $$PWD/../openssl/android-x86/libssl.so \
+        $$PWD/../openssl/android-x86/libcrypto.so
+}
+contains(ANDROID_TARGET_ARCH,x86_64) {
+    ANDROID_EXTRA_LIBS = \
+        $$PWD/../openssl/android-x86_64/libssl.so \
+        $$PWD/../openssl/android-x86_64/libcrypto.so
+}
 win32{
     !contains(QMAKE_TARGET.arch, x86_64) {
         message("x86 build")

fairchat/android/build.gradle

@@ -105,25 +105,41 @@ android {
 
     defaultConfig {
 
+        int archCode = 0
+
+        project.logger.lifecycle(android_armv7.toString())
+        project.logger.lifecycle(android_armv8.toString())
+        project.logger.lifecycle(android_x86.toString())
+
         if (android_armv7 == 1) {
             ndk {
                 abiFilters 'armeabi-v7a'
             }
+            archCode = 0
+            project.logger.lifecycle("arm 32")
+
         } else if (android_armv8 == 1){
             ndk {
                 abiFilters 'arm64-v8a'
             }
+            archCode = 1
+            project.logger.lifecycle("arm 64")
+
         } else if(android_x86 == 1){
             ndk {
                 abiFilters 'x86'
             }
+            archCode = 2
         }else if(android_x86_64 == 1){
             ndk {
                 abiFilters 'x86_64'
             }
+            archCode = 3
         }
 
-        versionCode versionMajor * (100000 + versionMinor * 1000)+1 + versionPatch * 100
+        versionCode versionMajor * 100000 + versionMinor * 1000 + versionPatch * 10 + archCode
+        project.logger.lifecycle(versionCode.toString())
+
         versionName QtApp.VERSION
     }
 

fairchat/fairchat.pro

@@ -52,7 +52,7 @@ ANDROID_x86 = 0
 ANDROID_x86_64 = 0
 
 
-contains(ANDROID_TARGET_ARCH,armeabi-v8a) {
+contains(ANDROID_TARGET_ARCH,arm64-v8a) {
     ANDROID_ARM64 = 1
 }
 contains(ANDROID_TARGET_ARCH,armeabi-v7a) {