From dc1113f4b618da35e06bd4a3c63ec62c10631aab Mon Sep 17 00:00:00 2001
From: "Oleg.Korshul" <Oleg.Korshul@onlyoffice.com>
Date: Sun, 4 Oct 2020 14:12:01 +0300
Subject: [PATCH] Andriod builds

---
 .gitignore                                                | 1 +
 Common/3dParty/icu/icu.pri                                | 8 ++++++++
 DesktopEditor/graphics/pro/graphics.pro                   | 1 -
 UnicodeConverter/UnicodeConverter.cpp                     | 5 ++++-
 UnicodeConverter/UnicodeConverter.pro                     | 5 -----
 ...al_android.cpp => UnicodeConverter_internal_empty.cpp} | 0
 6 files changed, 13 insertions(+), 7 deletions(-)
 rename UnicodeConverter/{UnicodeConverter_internal_android.cpp => UnicodeConverter_internal_empty.cpp} (100%)

diff --git a/.gitignore b/.gitignore
index 45a5431ccd..3a2947f0a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@ Common/3dParty/icu/linux_64
 Common/3dParty/icu/linux_32
 Common/3dParty/icu/mac_64
 Common/3dParty/icu/ios
+Common/3dParty/icu/android
 Common/3dParty/icu/mac-build
 Common/3dParty/cef/win_64
 Common/3dParty/cef/win_32
diff --git a/Common/3dParty/icu/icu.pri b/Common/3dParty/icu/icu.pri
index 424edb3815..d6a21cc5a6 100644
--- a/Common/3dParty/icu/icu.pri
+++ b/Common/3dParty/icu/icu.pri
@@ -31,3 +31,11 @@ core_ios {
     LIBS        += $$PWD/$$CORE_BUILDS_PLATFORM_PREFIX/build/libicui18n.a
     LIBS        += $$PWD/$$CORE_BUILDS_PLATFORM_PREFIX/build/libicuuc.a
 }
+
+core_android {
+    INCLUDEPATH += $$PWD/android/build/include
+    ICU_LIBS_PATH = $$replace(CORE_BUILDS_PLATFORM_PREFIX, "android_", "")
+
+    LIBS        += $$PWD/android/build/$$ICU_LIBS_PATH/libicuuc.so.$$ICU_MAJOR_VER
+    LIBS        += $$PWD/android/build/$$ICU_LIBS_PATH/libicudata.so.$$ICU_MAJOR_VER
+}
diff --git a/DesktopEditor/graphics/pro/graphics.pro b/DesktopEditor/graphics/pro/graphics.pro
index 48b7498d6d..f054a200d2 100644
--- a/DesktopEditor/graphics/pro/graphics.pro
+++ b/DesktopEditor/graphics/pro/graphics.pro
@@ -186,7 +186,6 @@ SOURCES += \
     ./../../raster/Metafile/Wmf/WmfClip.cpp \
     ./../../raster/Metafile/Wmf/WmfObjects.cpp \
     ./../../raster/Metafile/Wmf/WmfPlayer.cpp \
-    ./../../raster/Metafile/MetaFile.cpp \
 \
     ./../../raster/JBig2/source/JBig2File.cpp \
 \
diff --git a/UnicodeConverter/UnicodeConverter.cpp b/UnicodeConverter/UnicodeConverter.cpp
index 782fd92efb..f8bbe67133 100644
--- a/UnicodeConverter/UnicodeConverter.cpp
+++ b/UnicodeConverter/UnicodeConverter.cpp
@@ -39,7 +39,10 @@
 #include "../DesktopEditor/common/File.h"
 
 #if !defined (_WIN32) && !defined (_WIN64)
+#if defined (_LINUX) && !defined(__ANDROID__) && !defined(_IOS)
+    #define USE_ICONV
     #include "iconv.h"
+#endif
 #else
     #include <windows.h>
 #endif
@@ -316,7 +319,7 @@ namespace NSUnicodeConverter
                     sResult.erase(outsize_with_0 - 1);
                     ansi = false;
                 }
-#elif defined(__linux__)
+#elif defined(USE_ICONV)
                 std::string sCodepage =  "CP" + std::to_string(nCodepage);
 
                 iconv_t ic= iconv_open("WCHAR_T", sCodepage.c_str());
diff --git a/UnicodeConverter/UnicodeConverter.pro b/UnicodeConverter/UnicodeConverter.pro
index f8c430558c..f58f5bd3fb 100644
--- a/UnicodeConverter/UnicodeConverter.pro
+++ b/UnicodeConverter/UnicodeConverter.pro
@@ -30,11 +30,6 @@ core_ios {
     LIBS += -framework Foundation
 }
 
-core_android {
-    CONFIG += core_disable_icu
-    SOURCES += UnicodeConverter_internal_android.cpp
-}
-
 !core_disable_icu {
     include(../Common/3dParty/icu/icu.pri)
 
diff --git a/UnicodeConverter/UnicodeConverter_internal_android.cpp b/UnicodeConverter/UnicodeConverter_internal_empty.cpp
similarity index 100%
rename from UnicodeConverter/UnicodeConverter_internal_android.cpp
rename to UnicodeConverter/UnicodeConverter_internal_empty.cpp