diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-01-16 11:16:00 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2019-01-16 11:39:39 +0100 |
| commit | 7f4ee3646904fd90a6495b7549722acd9c8351af (patch) | |
| tree | 60c61bf3aa8b24e9452a3e8a5465cbde13275a99 /modules/webm/libvpx/SCsub | |
| parent | f0893235a52e914f810dca726919a2a66dd5ec70 (diff) | |
Android: Add support for x86_64 architecture
Like arm64v8, this is only supported by API 21 and later,
so we enforce 21 as min API for x86_64.
Part of #25030.
Diffstat (limited to 'modules/webm/libvpx/SCsub')
| -rw-r--r-- | modules/webm/libvpx/SCsub | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/webm/libvpx/SCsub b/modules/webm/libvpx/SCsub index df75dca310..2639d20620 100644 --- a/modules/webm/libvpx/SCsub +++ b/modules/webm/libvpx/SCsub @@ -272,9 +272,9 @@ else: import platform is_x11_or_server_arm = ((env["platform"] == 'x11' or env["platform"] == 'server') and (platform.machine().startswith('arm') or platform.machine().startswith('aarch'))) is_ios_x86 = (env["platform"] == 'iphone' and ("arch" in env and env["arch"].startswith('x86'))) - is_android_x86 = (env["platform"] == 'android' and env["android_arch"] == 'x86') + is_android_x86 = (env["platform"] == 'android' and env["android_arch"].startswith('x86')) if is_android_x86: - cpu_bits = '32' + cpu_bits = '32' if env["android_arch"] == 'x86' else '64' webm_cpu_x86 = not is_x11_or_server_arm and (cpu_bits == '32' or cpu_bits == '64') and (env["platform"] == 'windows' or env["platform"] == 'x11' or env["platform"] == 'osx' or env["platform"] == 'haiku' or is_android_x86 or is_ios_x86) webm_cpu_arm = is_x11_or_server_arm or (not is_ios_x86 and env["platform"] == 'iphone') or (not is_android_x86 and env["platform"] == 'android') |