diff --git a/androidbp/cmd/soong.go b/androidbp/cmd/soong.go index 20bf021da..7bd04639f 100644 --- a/androidbp/cmd/soong.go +++ b/androidbp/cmd/soong.go @@ -126,6 +126,8 @@ var cpuVariantConditionals = map[string]struct { "mips_rev6": {"ifdef ARCH_MIPS_REV6", "mips", false}, "atom": {"ifeq ($(TARGET_ARCH_VARIANT),atom)", "$(TARGET_ARCH)", true}, "silvermont": {"ifeq ($(TARGET_ARCH_VARIANT),silvermont)", "$(TARGET_ARCH)", true}, + "x86_sse3": {"ifeq ($(ARCH_X86_HAVE_SSE3),true)", "x86", true}, + "x86_sse4": {"ifeq ($(ARCH_X86_HAVE_SSE4),true)", "x86", true}, } var hostScopedPropertyConditionals = map[string]string{ diff --git a/common/arch.go b/common/arch.go index c0e63eb08..3d685e5ba 100644 --- a/common/arch.go +++ b/common/arch.go @@ -135,6 +135,10 @@ type archProperties struct { // Mips arch variants Mips_rev6 interface{} `blueprint:"filter(android:\"arch_variant\")"` + // X86 arch variants + X86_sse3 interface{} `blueprint:"filter(android:\"arch_variant\")"` + X86_sse4 interface{} `blueprint:"filter(android:\"arch_variant\")"` + // X86 cpu variants Atom interface{} `blueprint:"filter(android:\"arch_variant\")"` Silvermont interface{} `blueprint:"filter(android:\"arch_variant\")"`