From 181cfdf8988c9c0ce039a802d49793875bf92190 Mon Sep 17 00:00:00 2001 From: Jaewoong Jung Date: Fri, 14 Aug 2020 11:40:38 -0700 Subject: [PATCH] Fix broken darwin build. Offending change - I7b64de4b06e9bba3fba3712b25dd9f9d112e1625 Test: sh_binary_test.go Bug: 156980228 Fixes: 164465992 Change-Id: Idebfdf1ed7d8e10ba867c8eaac01410d754c7131 --- sh/sh_binary_test.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sh/sh_binary_test.go b/sh/sh_binary_test.go index c987123f2..3f2f16f51 100644 --- a/sh/sh_binary_test.go +++ b/sh/sh_binary_test.go @@ -211,7 +211,8 @@ func TestShTestHost_dataDeviceModules(t *testing.T) { } `) - variant := ctx.ModuleForTests("foo", "linux_glibc_x86_64") + buildOS := android.BuildOs.String() + variant := ctx.ModuleForTests("foo", buildOS+"_x86_64") relocated := variant.Output("relocated/lib64/libbar.so") expectedInput := filepath.Join(buildDir, ".intermediates/libbar/android_arm64_armv8-a_shared/libbar.so")