Merge pull request #412 from kiwix/fix_android_ci

Fix android ci

kiwixbuild/dependencies/base.py

@@ -315,12 +315,12 @@ class MakeBuilder(Builder):
         dep_conf_env = self.configure_env
         if not dep_conf_env:
             return
-        for k in list(dep_conf_env):
+        for k, v in dep_conf_env.items():
             if k.startswith('_format_'):
-                v = dep_conf_env.pop(k)
                 v = v.format(buildEnv=self.buildEnv, env=env)
-                dep_conf_env[k[8:]] = v
-        env.update(dep_conf_env)
+                env[k[8:]] = v
+            else:
+                env[k] = v
 
 
     def _configure(self, context):
@@ -524,5 +524,5 @@ class GradleBuilder(Builder):
         command = command.format(
             gradle_target=self.gradle_target,
             gradle_option=self.gradle_option)
-        env = self.buildEnv.get_env(cross_comp_flags=True, cross_compilers=True, cross_path=True)
+        env = self.buildEnv.get_env(cross_comp_flags=False, cross_compilers=True, cross_path=True)
         run_command(command, self.build_path, context, env=env)

kiwixbuild/platforms/android.py

@@ -145,3 +145,6 @@ class Android(MetaPlatformInfo):
         env = super().get_env()
         env['ANDROID_HOME'] = self.sdk_builder.install_path
         return env
+
+    def set_comp_flags(self, env):
+        pass