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

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

Merge "Fix broken darwin build." am: abdafede am: 6b4fd94b 

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

Change-Id: Iec2a4f466509cd9ed5de849713d5fd22ea194b6a
parents 5b7a789a 6b4fd94b

sh/sh_binary_test.go

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