openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Jaewoong Jung 2020-08-14 14:09:00 -07:00
parent e3c24b1c77
commit 8eee3f6b58
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sh/sh_binary_test.go
View File

@ -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 { for _, arch := range arches {
variant := ctx.ModuleForTests("foo", arch) variant := ctx.ModuleForTests("foo", arch)
@ -226,7 +227,7 @@ func TestShTestHost_dataDeviceModules(t *testing.T) {
expectedData := []string{ expectedData := []string{
filepath.Join(buildDir, ".intermediates/bar/android_arm64_armv8-a/:bar"), filepath.Join(buildDir, ".intermediates/bar/android_arm64_armv8-a/:bar"),
// libbar has been relocated, and so has a variant that matches the host arch. // 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"] actualData := entries.EntryMap["LOCAL_TEST_DATA"]
if !reflect.DeepEqual(expectedData, actualData) { if !reflect.DeepEqual(expectedData, actualData) {