From 25d57e0eef58a1b6fec544a3b407f696a1e4a36b Mon Sep 17 00:00:00 2001 From: rdb Date: Fri, 10 Dec 2021 13:42:20 +0100 Subject: [PATCH] dist: Fix incorrect arch check for Android in build_apps --- direct/src/dist/commands.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/direct/src/dist/commands.py b/direct/src/dist/commands.py index 3ec6866e03..308a96a910 100644 --- a/direct/src/dist/commands.py +++ b/direct/src/dist/commands.py @@ -421,9 +421,12 @@ class build_apps(setuptools.Command): # Default to all supported ABIs (for the given Android version). 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: 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!' else: self.android_abis = ['armeabi-v7a', 'x86']