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

Commit f610a74f authored by Liz Kammer's avatar Liz Kammer
Browse files

Add error message for unsupported x86 arch variant 

Previously this would result in a Ninja variable lookup, instead, let's
error sooner in Soong.

Test: CI
Change-Id: Ib3e15dce84364e6f7a83b82cb5f0e8694ffc9d2a
parent c2cdd8ab

cc/config/x86_64_device.go

+6 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
package config



import (

	"fmt"

	"strings"



	"android/soong/android"
@@ -190,6 +191,11 @@ func (toolchainX86_64) LibclangRuntimeLibraryArch() string { 
}



func x86_64ToolchainFactory(arch android.Arch) Toolchain {

	// Error now rather than having a confusing Ninja error

	if _, ok := x86_64ArchVariantCflags[arch.ArchVariant]; !ok {

		panic(fmt.Sprintf("Unknown x86_64 architecture version: %q", arch.ArchVariant))

	}



	toolchainCflags := []string{

		"${config.X86_64ToolchainCflags}",

		"${config.X86_64" + arch.ArchVariant + "VariantCflags}",

cc/config/x86_device.go

+6 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
package config



import (

	"fmt"

	"strings"



	"android/soong/android"
@@ -186,6 +187,11 @@ func (toolchainX86) LibclangRuntimeLibraryArch() string { 
}



func x86ToolchainFactory(arch android.Arch) Toolchain {

	// Error now rather than having a confusing Ninja error

	if _, ok := x86ArchVariantCflags[arch.ArchVariant]; !ok {

		panic(fmt.Sprintf("Unknown x86 architecture version: %q", arch.ArchVariant))

	}



	toolchainCflags := []string{

		"${config.X86ToolchainCflags}",

		"${config.X86" + arch.ArchVariant + "VariantCflags}",