summaryrefslogtreecommitdiff
path: root/platform/android
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2015-12-01 09:34:51 +0100
committerRémi Verschelde <remi@verschelde.fr>2015-12-01 09:34:51 +0100
commit99e7641f3dc244004dfaca9cb1a62a43709a26ed (patch)
tree95a4937c51595386006586e9f503c09843fc52c2 /platform/android
parente4a2458d4ccb2e6fbbb14826725bec537d633fa2 (diff)
Enable opus ARM optimisations only on ARM
i.e. do not enable it for x86. Fixes #2962.
Diffstat (limited to 'platform/android')
-rw-r--r--platform/android/detect.py3
1 files changed, 2 insertions, 1 deletions
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'):