From 022ca528c20e6b9229c6ef19995ae6668b562ea4 Mon Sep 17 00:00:00 2001 From: Vasil Dimov Date: Fri, 24 May 2013 14:50:51 +0300 Subject: [PATCH] In Android.mk: explicitly specify the toolchain If NDK is cloned from git://codeaurora.org/platform/prebuilt instead of from git://android.git.linaro.org/platform/prebuilt then prebuilt/linux-x86/toolchain/ contains some extra entries that confuse the toolchain pickup logic in cmake/toolchain/android.toolchain.cmake, thus we explicitly specify the toolchain via ANDROID_TOOLCHAIN_NAME. --- Android.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/Android.mk b/Android.mk index 7d1581d..7e4c7a7 100644 --- a/Android.mk +++ b/Android.mk @@ -51,6 +51,7 @@ apitrace_private_target: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain/android.toolchain.cmake \ -DANDROID_NDK=../../prebuilt/ndk/android-ndk-r7 \ -DANDROID_NDK_LAYOUT=LINARO \ + -DANDROID_TOOLCHAIN_NAME=arm-linux-androideabi-4.4.x \ -DANDROID_API_LEVEL=9 \ -DANDROID_NO_UNDEFINED=OFF \ -DLIBRARY_OUTPUT_PATH_ROOT=../../$(MY_APITRACE_BUILD_ROOT_TARGET) \ -- 2.45.2