TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-29 00:06:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

dist: Correct fix for android x86_64 ABI

Browse Source 
[skip ci]
This commit is contained in:
rdb 2022-03-17 13:29:03 +01:00
parent e272de8708
commit 3084fcd8dc
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
direct/src/dist/commands.py vendored
View File

@ -459,15 +459,15 @@ class build_apps(setuptools.Command):
if self.android_abis: if self.android_abis:
for abi in self.android_abis: for abi in self.android_abis:
assert abi not in ('mips64', 'x86-64', 'arm64-v8a'), \ assert abi not in ('mips64', 'x86_64', 'arm64-v8a'), \
f'{abi} was not a valid Android ABI before Android 21!' f'{abi} was not a valid Android ABI before Android 21!'
else: else:
self.android_abis = ['armeabi-v7a', 'x86'] self.android_abis = ['armeabi-v7a', 'x86']
elif not self.android_abis: elif not self.android_abis:
self.android_abis = ['arm64-v8a', 'armeabi-v7a', 'x86-64', 'x86'] self.android_abis = ['arm64-v8a', 'armeabi-v7a', 'x86_64', 'x86']
supported_abis = 'armeabi', 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86-64', 'mips', 'mips64' supported_abis = 'armeabi', 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64', 'mips', 'mips64'
unsupported_abis = set(self.android_abis) - set(supported_abis) unsupported_abis = set(self.android_abis) - set(supported_abis)
if unsupported_abis: if unsupported_abis:
raise ValueError(f'Unrecognized value(s) for android_abis: {", ".join(unsupported_abis)}\n' raise ValueError(f'Unrecognized value(s) for android_abis: {", ".join(unsupported_abis)}\n'