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

Set the android_abi variable in the meson_cross_file.txt 

Kiwix-lib need to know want is the android abi to copy the lib in the
right directory.
This commit is contained in:
Matthieu Gautier 2017-06-13 17:23:20 +02:00
parent 844eb9c2ef
commit 0e01aa0cee
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
kiwix-build.py
View File

@ -136,7 +136,8 @@ class TargetInfo:
'lsystem': 'windows', 'lsystem': 'windows',
'cpu_family': 'x86', 'cpu_family': 'x86',
'cpu': 'i686', 'cpu': 'i686',
'endian': 'little' 'endian': 'little',
'abi': ''
} }
} }
elif self.build == 'armhf': elif self.build == 'armhf':
@ -148,24 +149,25 @@ class TargetInfo:
'lsystem': 'linux', 'lsystem': 'linux',
'cpu_family': 'arm', 'cpu_family': 'arm',
'cpu': 'armhf', 'cpu': 'armhf',
'endian': 'little' 'endian': 'little',
'abi': ''
} }
} }
class AndroidTargetInfo(TargetInfo): class AndroidTargetInfo(TargetInfo):
__arch_infos = { __arch_infos = {
'arm' : ('arm-linux-androideabi', 'arm'), 'arm' : ('arm-linux-androideabi', 'arm', 'armeabi'),
'arm64': ('aarch64-linux-android', 'aarch64'), 'arm64': ('aarch64-linux-android', 'aarch64', 'arm64-v8a'),
'mips': ('mipsel-linux-android', 'mipsel'), 'mips': ('mipsel-linux-android', 'mipsel', 'mips'),
'mips64': ('mips64el-linux-android', 'mips64el'), 'mips64': ('mips64el-linux-android', 'mips64el', 'mips64'),
'x86': ('i686-linux-android', 'i686'), 'x86': ('i686-linux-android', 'i686', 'x86'),
'x86_64': ('x86_64-linux-android', 'x86_64'), 'x86_64': ('x86_64-linux-android', 'x86_64', 'x86_64'),
} }
def __init__(self, arch): def __init__(self, arch):
super().__init__('android', True, ['android_ndk', 'android_sdk']) super().__init__('android', True, ['android_ndk', 'android_sdk'])
self.arch = arch self.arch = arch
self.arch_full, self.cpu = self.__arch_infos[arch] self.arch_full, self.cpu, self.abi = self.__arch_infos[arch]
def __str__(self): def __str__(self):
return "android" return "android"
@ -179,8 +181,9 @@ class AndroidTargetInfo(TargetInfo):
'lsystem': 'android', 'lsystem': 'android',
'cpu_family': self.arch, 'cpu_family': self.arch,
'cpu': self.cpu, 'cpu': self.cpu,
'endian': 'little' 'endian': 'little',
} 'abi': self.abi
},
} }

1
templates/meson_cross_file.txt
View File

@ -10,6 +10,7 @@ c_link_args = {extra_libs!r}
cpp_link_args = {extra_libs!r} cpp_link_args = {extra_libs!r}
c_args = {extra_cflags!r} c_args = {extra_cflags!r}
cpp_args = {extra_cflags!r} cpp_args = {extra_cflags!r}
android_abi = '{host_machine[abi]}'
[host_machine] [host_machine]
cpu_family = '{host_machine[cpu_family]}' cpu_family = '{host_machine[cpu_family]}'