From ea0838a3a7bd33ee49a8bec1dc4b111e8cd720db Mon Sep 17 00:00:00 2001
From: Tobias Markmann <tm@ayena.de>
Date: Thu, 27 Nov 2014 13:47:40 +0100
Subject: Use ar tool from the cross-compiling toolchain when building for
 Android.

Test-Information:

Tested with nm tool from cross-compiling toolchain. Before it would report
'Malformed archive' for libSwiften.a. Now it correctly lists all symbols without
reporting an error.

Change-Id: I3901bb206487a05124986bbdc53f336aed932f5b

diff --git a/BuildTools/SCons/SConscript.boot b/BuildTools/SCons/SConscript.boot
index 00242fe..1455962 100644
--- a/BuildTools/SCons/SConscript.boot
+++ b/BuildTools/SCons/SConscript.boot
@@ -420,6 +420,7 @@ if target in ["android"] :
 	env["ENV"]["PATH"] = env["android_toolchain"] + "/bin:" + env["ENV"]["PATH"]
 	env["CC"] = "arm-linux-androideabi-gcc"
 	env["CXX"] = "arm-linux-androideabi-g++"
+	env["AR"] = "arm-linux-androideabi-ar"
 	env["RANLIB"] = "arm-linux-androideabi-ranlib"
 	env.Append(CPPDEFINES = ["ANDROID"])
 	env.Append(CPPDEFINES = ["_REENTRANT", "_GLIBCXX__PTHREADS"])
-- 
cgit v0.10.2-6-g49f6