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
diff --git a/etc/prebuilt_etc_test.go b/etc/prebuilt_etc_test.go
index 0fd04d8..70b5462 100644
--- a/etc/prebuilt_etc_test.go
+++ b/etc/prebuilt_etc_test.go
@@ -133,8 +133,8 @@
android.AssertStringEquals(t, "output file path", "different.name", p.outputFilePaths[1].Base())
expectedPaths := [...]string{
- "out/soong/target/product/test_device/system/etc/foodir",
- "out/soong/target/product/test_device/system/etc/bardir/extradir",
+ "out/target/product/test_device/system/etc/foodir",
+ "out/target/product/test_device/system/etc/bardir/extradir",
}
android.AssertPathRelativeToTopEquals(t, "install dir", expectedPaths[0], p.installDirPaths[0])
android.AssertPathRelativeToTopEquals(t, "install dir", expectedPaths[1], p.installDirPaths[1])
@@ -155,8 +155,8 @@
android.AssertStringEquals(t, "output file path", "different.name", p.outputFilePaths[1].Base())
expectedPaths := [...]string{
- "out/soong/target/product/test_device/system/etc/somewhere/foodir",
- "out/soong/target/product/test_device/system/etc/somewhere/bardir/extradir",
+ "out/target/product/test_device/system/etc/somewhere/foodir",
+ "out/target/product/test_device/system/etc/somewhere/bardir/extradir",
}
android.AssertPathRelativeToTopEquals(t, "install dir", expectedPaths[0], p.installDirPaths[0])
android.AssertPathRelativeToTopEquals(t, "install dir", expectedPaths[1], p.installDirPaths[1])
@@ -271,7 +271,7 @@
`)
p := result.Module("foo.conf", "android_arm64_armv8-a").(*PrebuiltEtc)
- expected := "out/soong/target/product/test_device/system/etc/bar"
+ expected := "out/target/product/test_device/system/etc/bar"
android.AssertPathRelativeToTopEquals(t, "install dir", expected, p.installDirPaths[0])
}
@@ -337,7 +337,7 @@
`)
p := result.Module("foo.conf", "android_arm64_armv8-a").(*PrebuiltEtc)
- expected := "out/soong/target/product/test_device/system"
+ expected := "out/target/product/test_device/system"
android.AssertPathRelativeToTopEquals(t, "install dir", expected, p.installDirPaths[0])
}
@@ -362,7 +362,7 @@
`)
p := result.Module("foo.conf", "android_arm64_armv8-a").(*PrebuiltEtc)
- expected := "out/soong/target/product/test_device/root/avb"
+ expected := "out/target/product/test_device/root/avb"
android.AssertPathRelativeToTopEquals(t, "install dir", expected, p.installDirPaths[0])
}
@@ -386,7 +386,7 @@
`)
p := result.Module("foo.conf", "android_arm64_armv8-a").(*PrebuiltEtc)
- expected := "out/soong/target/product/test_device/system/usr/share/bar"
+ expected := "out/target/product/test_device/system/usr/share/bar"
android.AssertPathRelativeToTopEquals(t, "install dir", expected, p.installDirPaths[0])
}
@@ -401,7 +401,7 @@
buildOS := result.Config.BuildOS.String()
p := result.Module("foo.conf", buildOS+"_common").(*PrebuiltEtc)
- expected := filepath.Join("out/soong/host", result.Config.PrebuiltOS(), "usr", "share", "bar")
+ expected := filepath.Join("out/host", result.Config.PrebuiltOS(), "usr", "share", "bar")
android.AssertPathRelativeToTopEquals(t, "install dir", expected, p.installDirPaths[0])
}
@@ -415,7 +415,7 @@
`)
p := result.Module("foo.conf", "android_arm64_armv8-a").(*PrebuiltEtc)
- expected := "out/soong/target/product/test_device/system/usr/hyphen-data/bar"
+ expected := "out/target/product/test_device/system/usr/hyphen-data/bar"
android.AssertPathRelativeToTopEquals(t, "install dir", expected, p.installDirPaths[0])
}
@@ -429,7 +429,7 @@
`)
p := result.Module("foo.conf", "android_arm64_armv8-a").(*PrebuiltEtc)
- expected := "out/soong/target/product/test_device/system/usr/keylayout/bar"
+ expected := "out/target/product/test_device/system/usr/keylayout/bar"
android.AssertPathRelativeToTopEquals(t, "install dir", expected, p.installDirPaths[0])
}
@@ -443,7 +443,7 @@
`)
p := result.Module("foo.conf", "android_arm64_armv8-a").(*PrebuiltEtc)
- expected := "out/soong/target/product/test_device/system/usr/keychars/bar"
+ expected := "out/target/product/test_device/system/usr/keychars/bar"
android.AssertPathRelativeToTopEquals(t, "install dir", expected, p.installDirPaths[0])
}
@@ -457,7 +457,7 @@
`)
p := result.Module("foo.conf", "android_arm64_armv8-a").(*PrebuiltEtc)
- expected := "out/soong/target/product/test_device/system/usr/idc/bar"
+ expected := "out/target/product/test_device/system/usr/idc/bar"
android.AssertPathRelativeToTopEquals(t, "install dir", expected, p.installDirPaths[0])
}
@@ -470,7 +470,7 @@
`)
p := result.Module("foo.conf", "android_common").(*PrebuiltEtc)
- expected := "out/soong/target/product/test_device/system/fonts"
+ expected := "out/target/product/test_device/system/fonts"
android.AssertPathRelativeToTopEquals(t, "install dir", expected, p.installDirPaths[0])
}
@@ -483,12 +483,12 @@
`)
p := result.Module("foo.conf", "android_arm64_armv8-a").(*PrebuiltEtc)
- expected := "out/soong/target/product/test_device/system/overlay"
+ expected := "out/target/product/test_device/system/overlay"
android.AssertPathRelativeToTopEquals(t, "install dir", expected, p.installDirPaths[0])
}
func TestPrebuiltFirmwareDirPath(t *testing.T) {
- targetPath := "out/soong/target/product/test_device"
+ targetPath := "out/target/product/test_device"
tests := []struct {
description string
config string
@@ -522,7 +522,7 @@
}
func TestPrebuiltDSPDirPath(t *testing.T) {
- targetPath := "out/soong/target/product/test_device"
+ targetPath := "out/target/product/test_device"
tests := []struct {
description string
config string
@@ -556,7 +556,7 @@
}
func TestPrebuiltRFSADirPath(t *testing.T) {
- targetPath := "out/soong/target/product/test_device"
+ targetPath := "out/target/product/test_device"
tests := []struct {
description string
config string
@@ -600,6 +600,6 @@
`)
p := result.Module("foo", "android_common").(*PrebuiltEtc)
- expected := "out/soong/target/product/test_device/product/media/alarms"
+ expected := "out/target/product/test_device/product/media/alarms"
android.AssertPathRelativeToTopEquals(t, "install dir", expected, p.installDirPaths[0])
}