X-Git-Url: http://git.tdb.fi/?p=builder.git;a=blobdiff_plain;f=source%2Fandroidtools.cpp;h=15126734de660f128b006573713eaf21f71a4874;hp=22a893e7bdcf41aac5912aaa8f0b40a09145f138;hb=d774d554c4c15b963215212b26a9ee5df3d705e8;hpb=f41742cb2b21241634c123561b71ee1667cb1ff4

diff --git a/source/androidtools.cpp b/source/androidtools.cpp
index 22a893e..1512673 100644
--- a/source/androidtools.cpp
+++ b/source/androidtools.cpp
@@ -114,6 +114,16 @@ AndroidNdk::AndroidNdk(Builder &b, const Architecture &a):
 	AndroidDevKit(b, "NDK"),
 	architecture(a)
 {
+	if(!root.empty())
+	{
+		FS::Path csr = root/"sysroot";
+		if(FS::exists(csr))
+		{
+			common_sysroot = csr;
+			builder.get_logger().log("tools", format("Android NDK common sysroot is %s", common_sysroot));
+		}
+	}
+
 	find_toolchain_dir();
 }
 
@@ -196,7 +206,7 @@ void AndroidNdk::init_api_level(unsigned api)
 	}
 
 	platform_sysroot = platform_archs_dir/("arch-"+use_arch);
-	builder.get_logger().log("tools", format("Android NDK sysroot is %s", platform_sysroot.str()));
+	builder.get_logger().log("tools", format("Android NDK platform sysroot is %s", platform_sysroot));
 }