X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fandroidtools.h;h=bef95f8abea4eecae75cd6a531957663217eb51e;hb=bde362811368647047f3ca13bdec596f092ecffe;hp=16f157d54dadbb2770572c80b90e83b99c8be29f;hpb=68f084e4ed817da0c25cefa1772cadf97b8cfe5e;p=builder.git

diff --git a/source/androidtools.h b/source/androidtools.h
index 16f157d..bef95f8 100644
--- a/source/androidtools.h
+++ b/source/androidtools.h
@@ -15,7 +15,7 @@ protected:
 	Msp::FS::Path root;
 	std::set<unsigned> supported_api_levels;
 
-	AndroidDevKit(Builder &, const std::string &);
+	AndroidDevKit(Builder &, const std::string &, const Msp::FS::Path & = Msp::FS::Path());
 	~AndroidDevKit() { }
 
 public:
@@ -38,7 +38,7 @@ public:
 
 private:
 	void find_build_tools_dir();
-	virtual void init_api_level(unsigned);
+	void init_api_level(unsigned) override;
 
 public:
 	const Msp::FS::Path &get_build_tools_dir() const { return build_tools_dir; }
@@ -50,17 +50,20 @@ class AndroidNdk: public AndroidDevKit
 private:
 	const Architecture &architecture;
 	Msp::FS::Path bin_dir;
+	Msp::FS::Path common_sysroot;
 	Msp::FS::Path platform_sysroot;
 
 public:
-	AndroidNdk(Builder &, const Architecture &);
-
+	AndroidNdk(Builder &, const Architecture &, const AndroidSdk &);
 private:
+	static Msp::FS::Path create_default_path(const AndroidSdk &);
+
 	void find_toolchain_dir();
-	virtual void init_api_level(unsigned);
+	void init_api_level(unsigned) override;
 
 public:
 	const Msp::FS::Path &get_bin_dir() const { return bin_dir; }
+	const Msp::FS::Path &get_common_sysroot() const { return common_sysroot; }
 	const Msp::FS::Path &get_platform_sysroot() const { return platform_sysroot; }
 };