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

Commit 0d99f7cd authored by Colin Cross's avatar Colin Cross
Browse files

Don't create a second host arch for tests on darwin 

Only x86_64 darwin is supported, not x86.  Don't create an x86
host arch when running tests on darwin.

Test: all soong tests
Change-Id: Ic12763298345e32a1340f8fbef338d2ab4d62b2e
parent 9a94287f

android/config.go

+10 −12
Original line number Diff line number Diff line
@@ -235,20 +235,14 @@ func TestConfig(buildDir string, env map[string]string) Config { 
}



func TestArchConfigNativeBridge(buildDir string, env map[string]string) Config {

	testConfig := TestConfig(buildDir, env)

	testConfig := TestArchConfig(buildDir, env)

	config := testConfig.config



	config.Targets = map[OsType][]Target{

		Android: []Target{

	config.Targets[Android] = []Target{

		{Android, Arch{ArchType: X86_64, ArchVariant: "silvermont", Native: true, Abi: []string{"arm64-v8a"}}, NativeBridgeDisabled},

		{Android, Arch{ArchType: X86, ArchVariant: "silvermont", Native: true, Abi: []string{"armeabi-v7a"}}, NativeBridgeDisabled},

		{Android, Arch{ArchType: Arm64, ArchVariant: "armv8-a", Native: true, Abi: []string{"arm64-v8a"}}, NativeBridgeEnabled},

		{Android, Arch{ArchType: Arm, ArchVariant: "armv7-a-neon", Native: true, Abi: []string{"armeabi-v7a"}}, NativeBridgeEnabled},

		},

		BuildOs: []Target{

			{BuildOs, Arch{ArchType: X86_64}, NativeBridgeDisabled},

			{BuildOs, Arch{ArchType: X86}, NativeBridgeDisabled},

		},

	}



	return testConfig
@@ -286,6 +280,10 @@ func TestArchConfig(buildDir string, env map[string]string) Config { 
		},

	}



	if runtime.GOOS == "darwin" {

		config.Targets[BuildOs] = config.Targets[BuildOs][:1]

	}



	config.BuildOsVariant = config.Targets[BuildOs][0].String()

	config.BuildOsCommonVariant = getCommonTargets(config.Targets[BuildOs])[0].String()

	config.TestProductVariables.DeviceArch = proptools.StringPtr("arm64")