diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-06-07 12:06:37 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-06-07 12:41:58 +0200 |
| commit | 2b7fadfd9c0fc084588af2074f9731041632ec22 (patch) | |
| tree | 47e68772d85105c641eed07aa800da26af0fbd12 /src/3rdparty/libwebp/src/dsp/cpu.c | |
| parent | 175dcf6e565bd638601697bfa6becd3a3321a0de (diff) | |
| parent | c1645fee237213074c5b3b53c21e8d9cd3a21167 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
Change-Id: I0d75cdb889e1ea18837037e08be531a99a8ce5eb
Diffstat (limited to 'src/3rdparty/libwebp/src/dsp/cpu.c')
| -rw-r--r-- | src/3rdparty/libwebp/src/dsp/cpu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/libwebp/src/dsp/cpu.c b/src/3rdparty/libwebp/src/dsp/cpu.c index b5583b6..b39184e 100644 --- a/src/3rdparty/libwebp/src/dsp/cpu.c +++ b/src/3rdparty/libwebp/src/dsp/cpu.c @@ -18,7 +18,7 @@ #include <string.h> #endif -#if defined(WEBP_ANDROID_NEON) +#if defined(WEBP_ANDROID_NEON) && !defined(Q_OS_ANDROID_EMBEDDED) #include <cpu-features.h> #endif @@ -168,7 +168,7 @@ static int x86CPUInfo(CPUFeature feature) { return 0; } VP8CPUInfo VP8GetCPUInfo = x86CPUInfo; -#elif defined(WEBP_ANDROID_NEON) // NB: needs to be before generic NEON test. +#elif defined(WEBP_ANDROID_NEON) && !defined(Q_OS_ANDROID_EMBEDDED) // NB: needs to be before generic NEON test. static int AndroidCPUInfo(CPUFeature feature) { const AndroidCpuFamily cpu_family = android_getCpuFamily(); const uint64_t cpu_features = android_getCpuFeatures(); |