Merge remote-tracking branch 'origin/master'

2 files changed, 10 insertions, 0 deletions

diff --git a/toolsrc/include/vcpkg/build.h b/toolsrc/include/vcpkg/build.h
index 1c22d39d8..a86245ccf 100644
--- a/toolsrc/include/vcpkg/build.h
+++ b/toolsrc/include/vcpkg/build.h
@@ -57,12 +57,20 @@ namespace vcpkg::Build
         RELEASE,
     };
 
+    enum class DownloadTool
+    {
+        BUILT_IN,
+        ARIA2,
+    };
+	const std::string& to_string(DownloadTool tool);
+
     struct BuildPackageOptions
     {
         UseHeadVersion use_head_version;
         AllowDownloads allow_downloads;
         CleanBuildtrees clean_buildtrees;
         CleanPackages clean_packages;
+        DownloadTool download_tool;
     };
 
     enum class BuildResult
diff --git a/toolsrc/include/vcpkg/vcpkgpaths.h b/toolsrc/include/vcpkg/vcpkgpaths.h
index 71f1bbba9..b3f24fb89 100644
--- a/toolsrc/include/vcpkg/vcpkgpaths.h
+++ b/toolsrc/include/vcpkg/vcpkgpaths.h
@@ -66,6 +66,7 @@ namespace vcpkg
         const fs::path& get_7za_exe() const;
         const fs::path& get_cmake_exe() const;
         const fs::path& get_git_exe() const;
+        const fs::path& get_ninja_exe() const;
         const fs::path& get_nuget_exe() const;
         const fs::path& get_ifw_installerbase_exe() const;
         const fs::path& get_ifw_binarycreator_exe() const;
@@ -84,6 +85,7 @@ namespace vcpkg
         Lazy<fs::path> _7za_exe;
         Lazy<fs::path> cmake_exe;
         Lazy<fs::path> git_exe;
+        Lazy<fs::path> ninja_exe;
         Lazy<fs::path> nuget_exe;
         Lazy<fs::path> ifw_installerbase_exe;
         Lazy<fs::path> ifw_binarycreator_exe;