From 5a304a9adb834afc946c949cf8538a4f8b5d7cdd Mon Sep 17 00:00:00 2001 From: Andras Becsi Date: Tue, 4 Feb 2014 17:12:25 +0100 Subject: Fix the embedded build Adopt to toolchain changes and fix the build with the current snapshot. This patch adds some missing overrides and build system configurations. Change-Id: I488929500347bdb5a077ac14e9553cedfcaa605d Reviewed-by: Jocelyn Turcotte --- src/core/gyp_run.pro | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/core/gyp_run.pro') diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro index 44e353e8b..2cc13b7ea 100644 --- a/src/core/gyp_run.pro +++ b/src/core/gyp_run.pro @@ -9,13 +9,13 @@ cross_compile { GYP_ARGS = "-D qt_cross_compile=1 -D os_posix=1" TOOLCHAIN_SYSROOT = $$[QT_SYSROOT] - linux-android { + android { CC = $$which($$QMAKE_CC) ANDROID_TOOLCHAIN = $$dirname(CC) TOOLCHAIN_SYSROOT = $$ANDROID_BUILD_TOP - GYP_ARGS += "-D android_src=\"$${ANDROID_BUILD_TOP}\" -D android_toolchain=\"$${ANDROID_TOOLCHAIN}\"" \ - "-D android_ndk_root=\"$${ANDROID_BUILD_TOP}\" -D android_product_out=\"$${ANDROID_PRODUCT_OUT}\"" + GYP_ARGS += "-D qt_os=\"android\" -D android_src=\"$${TOOLCHAIN_SYSROOT}\" -D android_toolchain=\"$${ANDROID_TOOLCHAIN}\"" \ + "-D android_ndk_root=\"$${TOOLCHAIN_SYSROOT}\" -D android_product_out=\"$${ANDROID_PRODUCT_OUT}\"" } !isEmpty(TOOLCHAIN_SYSROOT): GYP_ARGS += "-D sysroot=\"$${TOOLCHAIN_SYSROOT}\"" -- cgit v1.2.3