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

Commit 104ecf67 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Add error message for unsupported x86 arch variant"

parents d1072724 f610a74f

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}",