summaryrefslogtreecommitdiff
path: root/Android.mk
diff options
context:
space:
mode:
authorVasil Dimov <vd@FreeBSD.org>2013-05-24 14:50:51 +0300
committerVasil Dimov <vd@FreeBSD.org>2013-05-24 14:50:51 +0300
commit022ca528c20e6b9229c6ef19995ae6668b562ea4 (patch)
tree47d8d91c9d392bf4547f787744d199ba312b4bcd /Android.mk
parentcee519f80118853fe20264c1cc9ff827d66a621f (diff)
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.
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 7d1581d4..7e4c7a78 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) \