diff options
| author | Colin Kinloch <colin@kinlo.ch> | 2017-12-18 15:39:09 +0000 |
|---|---|---|
| committer | Colin Kinloch <colin@kinlo.ch> | 2017-12-23 16:49:04 +0000 |
| commit | 853b1daa499cf3add4014cf4d825c01603e2d1ea (patch) | |
| tree | f8e1f70e4701deb88dc591af916ffb4410005eed /modules/webm/libvpx | |
| parent | 9969c5c6a1cc103fb7b23c279b7fde0d92a5599a (diff) | |
Fixed android arm64v8
Diffstat (limited to 'modules/webm/libvpx')
| -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) |