Merge changes Ib3f4ee14,Iac22c9fd,Ibd78758c,I40d8696c,I2a2b10e4, ...

* changes:
  Fix InstallBypassMake symlink dependencies
  Add tests for ctx.InstallFile
  Fix OutDir vs SoongOutDir in tests
  Fix go vet error
  Add missing os.MkdirAll to WriteFileToOutputDir
  Use pathtools.WriteFileIfChanged in translateAndroidMk
This commit is contained in:
Colin Cross
2021-11-10 18:49:08 +00:00
committed by Gerrit Code Review
11 changed files with 383 additions and 82 deletions

View File

@@ -334,10 +334,8 @@ func TestConfig(buildDir string, env map[string]string, bp string, fs map[string
ShippingApiLevel: stringPtr("30"),
},
outDir: buildDir,
// soongOutDir is inconsistent with production (it should be buildDir + "/soong")
// but a lot of tests assume this :(
soongOutDir: buildDir,
outDir: buildDir,
soongOutDir: filepath.Join(buildDir, "soong"),
captureBuild: true,
env: envCopy,