From 16844390dab769404d9762a702c0cbc5d2d018f2 Mon Sep 17 00:00:00 2001 From: Volker Krause Date: Sat, 17 Feb 2018 10:28:30 +0100 Subject: Fix include path for x86 targets Summary: ANDROID_TOOLCHAIN is "x86" there, while the include path we want is "i686-linux-android". ANDROID_COMPILER_PREFIX has that value in all cases (for ARM both are the same, so nothing changes there). Reviewers: #build_system, apol Reviewed By: apol Subscribers: apol, dfaure, #frameworks Tags: #frameworks, #build_system Differential Revision: https://phabricator.kde.org/D10599 --- toolchain/Android.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'toolchain/Android.cmake') diff --git a/toolchain/Android.cmake b/toolchain/Android.cmake index 2f595a70..7e0dcaaf 100644 --- a/toolchain/Android.cmake +++ b/toolchain/Android.cmake @@ -182,7 +182,7 @@ include_directories(SYSTEM "${ANDROID_LIBS_ROOT}/include/" "${ANDROID_LIBS_ROOT}/libs/${ANDROID_ABI}/include" "${ANDROID_NDK}/sysroot/usr/include" - "${ANDROID_NDK}/sysroot/usr/include/${ANDROID_TOOLCHAIN}" + "${ANDROID_NDK}/sysroot/usr/include/${ANDROID_COMPILER_PREFIX}" ) # libraries -- cgit v1.2.1