From 2dae77433f2820abd352d1bb696bee63d787eb99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Otto=20Ryyn=C3=A4nen?= Date: Fri, 21 Apr 2017 12:37:20 +0300 Subject: Support for Q_OS_ANDROID_EMBEDDED and android-embedded builds The Embedded Android build (Boot to Qt Android injection) is defined by having both Q_OS_ANDROID and Q_OS_ANDROID_EMBEDDED flags defined, as well as having Qt config android-embedded. Those flags are set in mkspecs when building for embedded Android. This commit enables the possibility to build embedded Android builds. (i.e. Qt build for Android baselayer only, without JNI) Change-Id: I8d139b6d7b61c00ad44079cbfa6e5c77e8618a7b Reviewed-by: Eirik Aavitsland --- src/3rdparty/libwebp.pri | 2 +- 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 #endif -#if defined(WEBP_ANDROID_NEON) +#if defined(WEBP_ANDROID_NEON) && !defined(Q_OS_ANDROID_EMBEDDED) #include #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(); -- cgit v1.2.3