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

Fix compilation of kiwix-lib-app. 

- We should not try to set the cross compilation flags when we use
  gradle.
- Fix anyway the setting of tho cross compilation flags for android sdk
  platform (the default implementation use the `static` attributes that
  doesn't exist for android)
This commit is contained in:
Matthieu Gautier 2020-02-24 15:30:31 +01:00
parent 8bca6ea8dc
commit 32e3b5b5c4
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kiwixbuild/dependencies/base.py
View File

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