smallsolar
/
kiwix-build
mirror of https://github.com/kiwix/kiwix-build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #412 from kiwix/fix_android_ci 

Fix android ci
This commit is contained in:
Matthieu Gautier 2020-02-24 20:51:09 +01:00 committed by GitHub
parent 8bca6ea8dc 94c98261c7
commit 3f50b1b069
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
kiwixbuild/dependencies/base.py
View File

@ -315,12 +315,12 @@ class MakeBuilder(Builder):
dep_conf_env = self.configure_env dep_conf_env = self.configure_env
if not dep_conf_env: if not dep_conf_env:
return return
for k in list(dep_conf_env): for k, v in dep_conf_env.items():
if k.startswith('_format_'): if k.startswith('_format_'):
v = dep_conf_env.pop(k)
v = v.format(buildEnv=self.buildEnv, env=env) v = v.format(buildEnv=self.buildEnv, env=env)
dep_conf_env[k[8:]] = v env[k[8:]] = v
env.update(dep_conf_env) else:
env[k] = v
def _configure(self, context): def _configure(self, context):
@ -524,5 +524,5 @@ class GradleBuilder(Builder):
command = command.format( command = command.format(
gradle_target=self.gradle_target, gradle_target=self.gradle_target,
gradle_option=self.gradle_option) 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) run_command(command, self.build_path, context, env=env)

3
kiwixbuild/platforms/android.py
View File

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