StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename BuildDir and NinjaBuildDir.

Browse Source 
These are just out/ and out/soong/ and the old names were quite
confusing.

Test: Presubmits.
Merged-In: I999ca62162062f27e449f83ffb00fa580d4065b8
Merged-In: I2fcd80a9e376a6842a06aa104a9f6f5c5e16f8c7
Change-Id: Ib481d2aac40df8da1b74174dc8ec576c1cb48be0
This commit is contained in:
Lukacs T. Berki
2021-08-26 15:07:24 +02:00
parent 60dc5c0db2
commit 9f6c24a887
18 changed files with 91 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
android/testing.go
View File

@@ -664,15 +664,15 @@ func newBaseTestingComponent(config Config, provider testBuildProvider) baseTest
// containing at most one instance of the temporary build directory at the start of the path while
// this assumes that there can be any number at any position.
func normalizeStringRelativeToTop(config Config, s string) string {
// The buildDir usually looks something like: /tmp/testFoo2345/001
// The soongOutDir usually looks something like: /tmp/testFoo2345/001
//
// Replace any usage of the buildDir with out/soong, e.g. replace "/tmp/testFoo2345/001" with
// Replace any usage of the soongOutDir with out/soong, e.g. replace "/tmp/testFoo2345/001" with
// "out/soong".
outSoongDir := filepath.Clean(config.buildDir)
outSoongDir := filepath.Clean(config.soongOutDir)
re := regexp.MustCompile(`\Q` + outSoongDir + `\E\b`)
s = re.ReplaceAllString(s, "out/soong")
// Replace any usage of the buildDir/.. with out, e.g. replace "/tmp/testFoo2345" with
// Replace any usage of the soongOutDir/.. with out, e.g. replace "/tmp/testFoo2345" with
// "out". This must come after the previous replacement otherwise this would replace
// "/tmp/testFoo2345/001" with "out/001" instead of "out/soong".
outDir := filepath.Dir(outSoongDir)
@@ -991,7 +991,7 @@ func NormalizePathForTesting(path Path) string {
}
p := path.String()
if w, ok := path.(WritablePath); ok {
rel, err := filepath.Rel(w.getBuildDir(), p)
rel, err := filepath.Rel(w.getSoongOutDir(), p)
if err != nil {
panic(err)
}