Build android lib in the correct directory

kiwixbuild/buildenv.py

@@ -102,6 +102,8 @@ class BuildEnv:
         return os.path.isfile('/etc/debian_version')
 
     def _detect_libdir(self):
+        if self.platformInfo.libdir is not None:
+            return self.platformInfo.libdir
         if self._is_debianlike():
             try:
                 pc = subprocess.Popen(['dpkg-architecture', '-qDEB_HOST_MULTIARCH'],

kiwixbuild/platforms/android.py

@@ -12,6 +12,10 @@ class AndroidPlatformInfo(PlatformInfo):
     def __str__(self):
         return "android"
 
+    @property
+    def libdir(self):
+        return 'lib/{}'.format(self.arch_full)
+
     @property
     def binaries_name(self):
         arch_full = self.arch_full

kiwixbuild/platforms/base.py

@@ -24,6 +24,7 @@ class PlatformInfo(metaclass=_MetaPlatform):
     all_running_platforms = {}
     toolchain_names = []
     configure_option = ""
+    libdir = None
 
     @classmethod
     def get_platform(cls, name, targets=None):

kiwixbuild/versions.py

@@ -39,7 +39,7 @@ release_versions = {
 
 # This is the "version" of the whole base_deps_versions dict.
 # Change this when you change base_deps_versions.
-base_deps_meta_version = '76'
+base_deps_meta_version = '77'
 
 base_deps_versions = {
   'zlib' : '1.2.12',