From 6b7075f19fd4efa290179e894ae942e16ac9f699 Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Tue, 17 Dec 2024 10:42:42 -0800 Subject: Always install to out/target instead of out/soong/target So that when using soong-only builds, we don't have to update a bunch of tools and other parts of soong that expect files in out/target. Bug: 383892968 Test: m nothing --no-skip-soong-tests Change-Id: Idba3b5a416e6ffff799ec3ce632a8a4fbafe341f --- android/module_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'android/module_test.go') diff --git a/android/module_test.go b/android/module_test.go index d5bf94137..6e6d44909 100644 --- a/android/module_test.go +++ b/android/module_test.go @@ -327,21 +327,21 @@ func TestInstall(t *testing.T) { outputRule := func(name string) TestingBuildParams { return module(name, false).Output(name) } installRule := func(name string) TestingBuildParams { - return module(name, false).Output(filepath.Join("out/soong/target/product/test_device/system", name)) + return module(name, false).Output(filepath.Join("out/target/product/test_device/system", name)) } symlinkRule := func(name string) TestingBuildParams { - return module(name, false).Output(filepath.Join("out/soong/target/product/test_device/system/symlinks", name)) + return module(name, false).Output(filepath.Join("out/target/product/test_device/system/symlinks", name)) } hostOutputRule := func(name string) TestingBuildParams { return module(name, true).Output(name) } hostInstallRule := func(name string) TestingBuildParams { - return module(name, true).Output(filepath.Join("out/soong/host/linux-x86", name)) + return module(name, true).Output(filepath.Join("out/host/linux-x86", name)) } hostSymlinkRule := func(name string) TestingBuildParams { - return module(name, true).Output(filepath.Join("out/soong/host/linux-x86/symlinks", name)) + return module(name, true).Output(filepath.Join("out/host/linux-x86/symlinks", name)) } assertInputs := func(params TestingBuildParams, inputs ...Path) { -- cgit v1.2.3-59-g8ed1b