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
diff --git a/sh/sh_binary_test.go b/sh/sh_binary_test.go
index 3f2f16f..650efa5 100644
--- a/sh/sh_binary_test.go
+++ b/sh/sh_binary_test.go
@@ -140,7 +140,8 @@
}
`)
- 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 @@
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) {
