diff options
| -rw-r--r-- | src/3rdparty/libwebp.pri | 2 | ||||
| -rw-r--r-- | src/3rdparty/libwebp/src/dsp/cpu.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/3rdparty/libwebp.pri b/src/3rdparty/libwebp.pri index 61fbee9..55d7e60 100644 --- a/src/3rdparty/libwebp.pri +++ b/src/3rdparty/libwebp.pri @@ -113,7 +113,7 @@ SOURCES += \ $$PWD/libwebp/src/utils/thread_utils.c \ $$PWD/libwebp/src/utils/utils.c -android { +android:!android-embedded { SOURCES += $$NDK_ROOT/sources/android/cpufeatures/cpu-features.c INCLUDEPATH += $$NDK_ROOT/sources/android/cpufeatures } 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(); |