Moving ctx.BuildPath usage out of CppIncludeFinder

Author: cmaglie

Diff for: legacy/builder/container_find_includes.go

@@ -112,7 +112,7 @@ import (
 type ContainerFindIncludes struct{}
 
 func (s *ContainerFindIncludes) Run(ctx *types.Context) error {
-	finder := NewCppIncludesFinder(ctx)
+	finder := NewCppIncludesFinder(ctx, ctx.BuildPath.Join("includes.cache"))
 	finder.UseIncludeDir(ctx.BuildProperties.GetPath("build.core.path"))
 	if variantPath := ctx.BuildProperties.GetPath("build.variant.path"); variantPath != nil {
 		finder.UseIncludeDir(variantPath)
@@ -147,10 +147,10 @@ type CppIncludesFinder struct {
 }
 
 // NewCppIncludesFinder create a new include
-func NewCppIncludesFinder(ctx *types.Context) *CppIncludesFinder {
+func NewCppIncludesFinder(ctx *types.Context, cachePath *paths.Path) *CppIncludesFinder {
 	return &CppIncludesFinder{
 		ctx:   ctx,
-		cache: loadCacheFrom(ctx.BuildPath.Join("includes.cache")),
+		cache: loadCacheFrom(cachePath),
 		queue: &UniqueSourceFileQueue{},
 		log:   logrus.WithField("task", "DetectingLibraries"),
 	}