Added ifdef to exclude ICU/unicode code from Android build

src/common/stringTools.cpp

@@ -19,18 +19,20 @@
 
 #include "stringTools.h"
 
+#ifndef __ANDROID__
+
 /* Prepare integer for display */
 std::string kiwix::beautifyInteger(const unsigned int number) {
   std::stringstream numberStream;
   numberStream << number;
   std::string numberString = numberStream.str();
-  
+
   signed int offset = numberString.size() - 3;
   while (offset > 0) {
     numberString.insert(offset, ",");
     offset -= 3;
   }
-  
+
   return numberString;
 }
 
@@ -41,14 +43,14 @@ std::vector<std::string> kiwix::split(const std::string & str,
   std::string::size_type lastPos = str.find_first_not_of(delims, 0);
   std::string::size_type pos = str.find_first_of(delims, lastPos);
   std::vector<std::string> tokens;
- 
+
   while (std::string::npos != pos || std::string::npos != lastPos)
     {
       tokens.push_back(str.substr(lastPos, pos - lastPos));
       lastPos = str.find_first_not_of(delims, pos);
       pos     = str.find_first_of(delims, lastPos);
     }
- 
+
   return tokens;
 }
 
@@ -190,3 +192,26 @@ std::string kiwix::urlDecode(const std::string &SRC) {
   return (ret);
 }
 
+#else
+
+std::string kiwix::ucFirst (const std::string &word) {
+  if (word.empty())
+    return "";
+
+	std::string new_string = word;
+	new_string[0] = toupper(new_string[0]);
+
+  return new_string;
+}
+
+std::string kiwix::lcFirst (const std::string &word) {
+  if (word.empty())
+    return "";
+
+	std::string new_string = word;
+	new_string[0] = tolower(new_string[0]);
+
+  return new_string;
+}
+
+#endif

src/common/stringTools.h

@@ -20,6 +20,7 @@
 #ifndef KIWIX_STRINGTOOLS_H
 #define KIWIX_STRINGTOOLS_H
 
+#ifndef __ANDROID__
 #include <unicode/translit.h>
 #include <unicode/normlzr.h>
 #include <unicode/unistr.h>
@@ -28,6 +29,7 @@
 #include <unicode/uniset.h>
 #include <unicode/ustring.h>
 #include <unicode/ucnv.h>
+ #endif
 
 #include <iostream>
 #include <vector>
@@ -36,6 +38,7 @@
 #include <sstream>
 
 namespace kiwix {
+#ifndef __ANDROID__
   std::string removeAccents(const std::string &text);
   std::string beautifyInteger(const unsigned int number);
   std::vector<std::string> split(const std::string&, const std::string&);
@@ -45,14 +48,17 @@ namespace kiwix {
 
   void printStringInHexadecimal(const char *s);
   void printStringInHexadecimal(UnicodeString s);
+#endif
 
   std::string ucFirst(const std::string &word);
   std::string lcFirst(const std::string &word);
-  
+
+#ifndef __ANDROID__
   void stringReplacement(std::string& str, const std::string& oldStr, const std::string& newStr);
 
   std::string urlEncode(const std::string &c);
   std::string urlDecode(const std::string &c);
+#endif
 }
 
 #endif