diff options
| author | 2021-07-20 09:47:41 -0700 | |
|---|---|---|
| committer | 2021-07-20 12:46:48 -0700 | |
| commit | 0c66bc615b399d2201b15b4c9052066db04a3f5e (patch) | |
| tree | be8334e4662f4bf137d2231dc92755e44fc85d5e /sh/sh_binary_test.go | |
| parent | ae86338676084cf5966adf99f34e7086f9687edc (diff) | |
Replace android.BuildOs with Config.BuildOS
Replace the android.BuildOs constant with Config.BuildOS so that it
can vary based on the product config.
Bug: 190084016
Test: all Soong tests
Change-Id: Ia67f872d8b2ab788747a22e3a9659dc21c9775cd
Diffstat (limited to 'sh/sh_binary_test.go')
| -rw-r--r-- | sh/sh_binary_test.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sh/sh_binary_test.go b/sh/sh_binary_test.go index 20317d88c..865d5f3d1 100644 --- a/sh/sh_binary_test.go +++ b/sh/sh_binary_test.go @@ -115,7 +115,7 @@ func TestShTest_dataModules(t *testing.T) { } `) - buildOS := android.BuildOs.String() + buildOS := config.BuildOS.String() arches := []string{"android_arm64_armv8-a", buildOS + "_x86_64"} for _, arch := range arches { variant := ctx.ModuleForTests("foo", arch) @@ -155,7 +155,7 @@ func TestShTestHost(t *testing.T) { } `) - buildOS := android.BuildOs.String() + buildOS := ctx.Config().BuildOS.String() mod := ctx.ModuleForTests("foo", buildOS+"_x86_64").Module().(*ShTest) if !mod.Host() { t.Errorf("host bit is not set for a sh_test_host module.") @@ -192,7 +192,7 @@ func TestShTestHost_dataDeviceModules(t *testing.T) { } `) - buildOS := android.BuildOs.String() + buildOS := config.BuildOS.String() variant := ctx.ModuleForTests("foo", buildOS+"_x86_64") relocated := variant.Output("relocated/lib64/libbar.so") |