From 99e7641f3dc244004dfaca9cb1a62a43709a26ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Tue, 1 Dec 2015 09:34:51 +0100 Subject: [PATCH] Enable opus ARM optimisations only on ARM i.e. do not enable it for x86. Fixes #2962. --- platform/android/detect.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/platform/android/detect.py b/platform/android/detect.py index 9db5d02b48..9a925039a5 100644 --- a/platform/android/detect.py +++ b/platform/android/detect.py @@ -210,7 +210,8 @@ def configure(env): # env.Append(CPPFLAGS=['-DANDROID_ENABLED', '-DUNIX_ENABLED','-DMPC_FIXED_POINT']) if(env["opus"]=="yes"): - env.Append(CFLAGS=["-DOPUS_ARM_OPT"]) + if (env["android_arch"]=="armv6" or env["android_arch"]=="armv7"): + env.Append(CFLAGS=["-DOPUS_ARM_OPT"]) env.opus_fixed_point="yes" if (env['android_stl']=='yes'):