| commit | 9f6c24a887ee30ae27f42bc0ec26b0188b4c7fc7 | [log] [tgz] |
|---|---|---|
| author | Lukacs T. Berki <lberki@google.com> | Thu Aug 26 15:07:24 2021 +0200 |
| committer | Lukacs T. Berki <lberki@google.com> | Fri Aug 27 10:08:49 2021 +0200 |
| tree | f8caaf07c4265d4e50a5d13a2dd34923889753ef | |
| parent | 60dc5c0db29aed77aee195d0e5db608361a98d75 [diff] [blame] |
Rename BuildDir and NinjaBuildDir. 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
diff --git a/android/fixture.go b/android/fixture.go index fd051a7..728f031 100644 --- a/android/fixture.go +++ b/android/fixture.go
@@ -834,7 +834,7 @@ func (r *TestResult) NormalizePathForTesting(path Path) string { pathContext := PathContextForTesting(r.Config) pathAsString := path.String() - if rel, isRel := MaybeRel(pathContext, r.Config.BuildDir(), pathAsString); isRel { + if rel, isRel := MaybeRel(pathContext, r.Config.SoongOutDir(), pathAsString); isRel { return rel } return pathAsString