tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Fix broken darwin build."

Browse source
This commit is contained in:
Jaewoong Jung 2020-08-15 00:19:12 +00:00 committed by Gerrit Code Review
commit abdafede81
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 {
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) {