From 3084fcd8dc8fa2c29ea5b58860ea8b060e6e46aa Mon Sep 17 00:00:00 2001 From: rdb Date: Thu, 17 Mar 2022 13:29:03 +0100 Subject: [PATCH] dist: Correct fix for android x86_64 ABI [skip ci] --- direct/src/dist/commands.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/direct/src/dist/commands.py b/direct/src/dist/commands.py index 7019fbfef2..432375c6c1 100644 --- a/direct/src/dist/commands.py +++ b/direct/src/dist/commands.py @@ -459,15 +459,15 @@ 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' + supported_abis = 'armeabi', 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64', 'mips', 'mips64' unsupported_abis = set(self.android_abis) - set(supported_abis) if unsupported_abis: raise ValueError(f'Unrecognized value(s) for android_abis: {", ".join(unsupported_abis)}\n'