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

Merge "Replace android.BuildOs with Config.BuildOS"

Browse Source
This commit is contained in:
Colin Cross
2021-07-23 00:07:01 +00:00
committed by Gerrit Code Review
parent 2e4c0eb90e 0c66bc615b
commit 78fd15f7d6
22 changed files with 457 additions and 421 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
etc/prebuilt_etc_test.go
View File

@@ -188,7 +188,7 @@ func TestPrebuiltEtcHost(t *testing.T) {
}
`)
buildOS := android.BuildOs.String()
buildOS := result.Config.BuildOS.String()
p := result.Module("foo.conf", buildOS+"_common").(*PrebuiltEtc)
if !p.Host() {
t.Errorf("host bit is not set for a prebuilt_etc_host module.")
@@ -242,7 +242,7 @@ func TestPrebuiltUserShareHostInstallDirPath(t *testing.T) {
}
`)
buildOS := android.BuildOs.String()
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")
android.AssertPathRelativeToTopEquals(t, "install dir", expected, p.installDirPath)