diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-02-14 11:55:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-14 11:55:28 +0100 |
| commit | 717e388e19c70de430c2d1719cec5144781e6476 (patch) | |
| tree | fe78ecc0bb8e417e57b2dadf072dbe7d2895b812 /modules | |
| parent | dea5a69693eeee956e8b72ee50e166a70f4dc498 (diff) | |
| parent | 853b1daa499cf3add4014cf4d825c01603e2d1ea (diff) | |
Merge pull request #14804 from ColinKinloch/master
Fixed android arm64v8
Diffstat (limited to 'modules')
| -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 73ba17d184..aa282338cb 100644 --- a/modules/webm/libvpx/SCsub +++ b/modules/webm/libvpx/SCsub @@ -333,7 +333,7 @@ if webm_cpu_x86: if webm_cpu_arm: if env["platform"] == 'iphone': env_libvpx["ASFLAGS"] = '-arch armv7' - elif env["platform"] == 'android' or env["platform"] == 'x11' or env["platform"] == 'server': + elif env["platform"] == 'android' and env["android_arch"] == 'armv7' or env["platform"] == 'x11' or env["platform"] == 'server': env_libvpx["ASFLAGS"] = '-mfpu=neon' elif env["platform"] == 'uwp': env_libvpx["AS"] = 'armasm' @@ -389,5 +389,5 @@ elif webm_cpu_arm: env_libvpx.add_source_files(env.modules_sources, libvpx_sources_arm_neon_armasm_ms) elif env["platform"] == 'iphone': env_libvpx.add_source_files(env.modules_sources, libvpx_sources_arm_neon_gas_apple) - else: + elif not env["android_arch"] == 'arm64v8': env_libvpx.add_source_files(env.modules_sources, libvpx_sources_arm_neon_gas) |