Account for install directories when forming displaced dependency paths

[builder.git] / source / androidtools.h

diff --git a/source/androidtools.h b/source/androidtools.h
index 16f157d54dadbb2770572c80b90e83b99c8be29f..dfa8a11a09946ba4a1020a298ee99e00b0688958 100644 (file)
--- 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:
@@ -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);
 
 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; }
 };