diff options
| author | 2020-08-14 14:09:00 -0700 | |
|---|---|---|
| committer | 2020-08-14 14:27:02 -0700 | |
| commit | 8eee3f6b585085f71a1cadc8f7dbdbe6e6dc9e8d (patch) | |
| tree | c6668493763eada2c6316a38f73deaee505d22e3 /sh/sh_binary_test.go | |
| parent | e3c24b1c77817e3fe727985907314ba9e456ac07 (diff) | |
Fix broken darwin build.
Offending change - I7b64de4b06e9bba3fba3712b25dd9f9d112e1625
This is in addition to Idebfdf1ed7d8e10ba867c8eaac01410d754c7131
Test: sh_binary_test.go
Bug: 156980228
Bug: 164465992
Change-Id: I8d01d0e82efe764cc6901bb3e2c2767c8b25d81f
Diffstat (limited to 'sh/sh_binary_test.go')
| -rw-r--r-- | sh/sh_binary_test.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sh/sh_binary_test.go b/sh/sh_binary_test.go index 3f2f16f51..650efa5d6 100644 --- a/sh/sh_binary_test.go +++ b/sh/sh_binary_test.go @@ -140,7 +140,8 @@ func TestShTest_dataModules(t *testing.T) { } `) - arches := []string{"android_arm64_armv8-a", "linux_glibc_x86_64"} + buildOS := android.BuildOs.String() + arches := []string{"android_arm64_armv8-a", buildOS + "_x86_64"} for _, arch := range arches { variant := ctx.ModuleForTests("foo", arch) @@ -226,7 +227,7 @@ func TestShTestHost_dataDeviceModules(t *testing.T) { expectedData := []string{ filepath.Join(buildDir, ".intermediates/bar/android_arm64_armv8-a/:bar"), // libbar has been relocated, and so has a variant that matches the host arch. - filepath.Join(buildDir, ".intermediates/foo/linux_glibc_x86_64/relocated/:lib64/libbar.so"), + filepath.Join(buildDir, ".intermediates/foo/"+buildOS+"_x86_64/relocated/:lib64/libbar.so"), } actualData := entries.EntryMap["LOCAL_TEST_DATA"] if !reflect.DeepEqual(expectedData, actualData) { |