Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e22ef09f authored by Jaewoong Jung's avatar Jaewoong Jung Committed by Automerger Merge Worker
Browse files

Merge "Fix broken darwin build." am: e3c24b1c 

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

Change-Id: I50d2bbc7e1897b9cfadf2f24a36f1f4edea8976a
parents 30a09c0b e3c24b1c

sh/sh_binary_test.go

+2 −1
Original line number Diff line number Diff line
@@ -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")