Merge branch 'android-x86Support' into 'master'

android x86 openssl

See merge request !209

RocketChatMobileModular.pro

@@ -12,11 +12,6 @@ contains(ANDROID_TARGET_ARCH,arm64-v8a) {
         $$PWD/../openssl/android-arm64/libssl.so \
         $$PWD/../openssl/android-arm64/libcrypto.so
 }
-contains(ANDROID_TARGET_ARCH,) {
-    ANDROID_EXTRA_LIBS = \
-        $$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 \

fairchat/android/src/com/osalliance/rocketchatMobile/MainActivity.java

@@ -128,8 +128,8 @@ public class MainActivity extends QtActivity {
             e.printStackTrace();
             }*/
 
-        Fabric fabric = new Fabric.Builder(this).debuggable(true).kits(new Crashlytics(), new CrashlyticsNdk()).build();
-        Fabric.with(fabric);
+       // Fabric fabric = new Fabric.Builder(this).debuggable(true).kits(new Crashlytics(), new CrashlyticsNdk()).build();
+        Fabric.with(this, new Crashlytics(), new CrashlyticsNdk());
         //Fabric.with(this, new Crashlytics(), new CrashlyticsNdk());
 
         //Fabric.with(this, new Crashlytics(), new CrashlyticsNdk());

fairchat/fairchat.pro

@@ -51,18 +51,29 @@ ANDROID_ARMv7 = 0
 ANDROID_x86 = 0
 ANDROID_x86_64 = 0
 
-
-contains(ANDROID_TARGET_ARCH,arm64-v8a) {
-    ANDROID_ARM64 = 1
-}
 contains(ANDROID_TARGET_ARCH,armeabi-v7a) {
     ANDROID_ARMv7 = 1
+    ANDROID_EXTRA_LIBS = \
+        $$PWD/../openssl/android-arm/libcrypto.so \
+        $$PWD/../openssl/android-arm/libssl.so
+}
+contains(ANDROID_TARGET_ARCH,arm64-v8a) {
+    ANDROID_ARM64 = 1
+    ANDROID_EXTRA_LIBS = \
+        $$PWD/../openssl/android-arm64/libssl.so \
+        $$PWD/../openssl/android-arm64/libcrypto.so
 }
 contains(ANDROID_TARGET_ARCH,x86) {
     ANDROID_x86 =  1
+    ANDROID_EXTRA_LIBS = \
+        $$PWD/../openssl/android-x86/libssl.so \
+        $$PWD/../openssl/android-x86/libcrypto.so
 }
 contains(ANDROID_TARGET_ARCH,x86_64) {
     ANDROID_x86_64 =  1
+    ANDROID_EXTRA_LIBS = \
+        $$PWD/../openssl/android-x86_64/libssl.so \
+        $$PWD/../openssl/android-x86_64/libcrypto.so
 }
 
 DEFINES += VERSION=\\\"$$VERSION\\\"
@@ -102,17 +113,6 @@ android{
     QMAKE_POST_LINK = $$QMAKE_COPY $$shell_path($$[QT_INSTALL_TRANSLATIONS]/qt*_de.qm) $$TRDESTDIR
 }
 
-contains(ANDROID_TARGET_ARCH,armeabi-v7a) {
-    ANDROID_EXTRA_LIBS = \
-        $$PWD/../openssl/android-arm/libssl.so \
-        $$PWD/../openssl/android-arm/libcrypto.so
-}
-contains(ANDROID_TARGET_ARCH,armeabi-v8a) {
-    ANDROID_EXTRA_LIBS = \
-        $$PWD/../openssl/android-arm64/libssl.so \
-        $$PWD/../openssl/android-arm64/libcrypto.so
-}
-
 ios{
 
     QT += gui-private