TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-01 09:23:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

dist: Fix accidental error message with x86_64 ABI with Android

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

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

@ -459,13 +459,13 @@ class build_apps(setuptools.Command):
if 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!'
else:
self.android_abis = ['armeabi-v7a', 'x86']
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'
unsupported_abis = set(self.android_abis) - set(supported_abis)