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

Merge "Fix broken darwin build." am: e3c24b1c77 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1400887

Change-Id: I50d2bbc7e1897b9cfadf2f24a36f1f4edea8976a
This commit is contained in:
Jaewoong Jung 2020-08-14 19:19:53 +00:00 committed by Automerger Merge Worker
parent 30a09c0b81 e3c24b1c77
commit e22ef09f6c
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sh/sh_binary_test.go
View File

@ -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")