.

.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

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 \
 \

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());

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)