TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 16:58:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

dist: Fix incorrect arch check for Android in build_apps

Browse Source
This commit is contained in:
rdb 2021-12-10 13:42:20 +01:00
parent 1289d5bfb4
commit 25d57e0eef
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -421,9 +421,12 @@ class build_apps(setuptools.Command):
# Default to all supported ABIs (for the given Android version). # Default to all supported ABIs (for the given Android version).
if self.android_max_sdk_version and self.android_max_sdk_version < 21: if self.android_max_sdk_version and self.android_max_sdk_version < 21:
assert self.android_max_sdk_version >= 19, \
'Panda3D requires at least Android API level 19!'
if self.android_abis: if self.android_abis:
for abi in self.android_abis: for abi in self.android_abis:
assert abi 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']