From fbaf725ed3e70b3661bcdbd4d7c91d262abf43fd Mon Sep 17 00:00:00 2001 From: "Lukacs T. Berki" Date: Thu, 19 Aug 2021 09:36:42 +0200 Subject: Rename BuildDir and NinjaBuildDir. These are just out/ and out/soong/ and the old names were quite confusing. Test: Presubmits. Change-Id: I999ca62162062f27e449f83ffb00fa580d4065b8 --- java/app_test.go | 2 +- java/base.go | 2 +- java/java_test.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'java') diff --git a/java/app_test.go b/java/app_test.go index c14c65d18..f4fdfa756 100644 --- a/java/app_test.go +++ b/java/app_test.go @@ -1737,7 +1737,7 @@ func TestPackageNameOverride(t *testing.T) { foo := result.ModuleForTests("foo", "android_common") - outSoongDir := result.Config.BuildDir() + outSoongDir := result.Config.SoongOutDir() outputs := foo.AllOutputs() outputMap := make(map[string]bool) diff --git a/java/base.go b/java/base.go index ea5b13721..416d82a67 100644 --- a/java/base.go +++ b/java/base.go @@ -793,7 +793,7 @@ func (j *Module) collectJavacFlags( // Manually specify build directory in case it is not under the repo root. // (javac doesn't seem to expand into symbolic links when searching for patch-module targets, so // just adding a symlink under the root doesn't help.) - patchPaths := []string{".", ctx.Config().BuildDir()} + patchPaths := []string{".", ctx.Config().SoongOutDir()} // b/150878007 // diff --git a/java/java_test.go b/java/java_test.go index b6780c20c..8bb017f0b 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -1183,7 +1183,7 @@ func checkPatchModuleFlag(t *testing.T, ctx *android.TestContext, moduleName str break } } - if expected != android.StringPathRelativeToTop(ctx.Config().BuildDir(), got) { + if expected != android.StringPathRelativeToTop(ctx.Config().SoongOutDir(), got) { t.Errorf("Unexpected patch-module flag for module %q - expected %q, but got %q", moduleName, expected, got) } } -- cgit v1.2.3-59-g8ed1b