From f610a74f4cf6728954ddfd4fcdde46e2e1642f28 Mon Sep 17 00:00:00 2001 From: Liz Kammer Date: Thu, 10 Feb 2022 16:56:02 -0500 Subject: [PATCH] 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 --- cc/config/x86_64_device.go | 6 ++++++ cc/config/x86_device.go | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/cc/config/x86_64_device.go b/cc/config/x86_64_device.go index 00f07ff26..d789cde5c 100644 --- a/cc/config/x86_64_device.go +++ b/cc/config/x86_64_device.go @@ -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}", diff --git a/cc/config/x86_device.go b/cc/config/x86_device.go index 29f059303..e32e1bde7 100644 --- a/cc/config/x86_device.go +++ b/cc/config/x86_device.go @@ -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}",