From 8f301d583fb41374c3a3b9041e5189e2640ab2ee Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 15 Jul 2015 14:47:36 -0700 Subject: [PATCH] Fix duplicated ARCH_X86_HAVE_SSE* clauses ARCH_X86_HAVE_SSE* should not have second_arch set, they always apply to x86 regardless of TARGET_ARCH vs. TARGET_2ND_ARCH. Change-Id: I21fa4c88e9c966a7181f3b17c95c06080b678556 --- androidbp/cmd/soong.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/androidbp/cmd/soong.go b/androidbp/cmd/soong.go index 7bd04639f..1dffe4a65 100644 --- a/androidbp/cmd/soong.go +++ b/androidbp/cmd/soong.go @@ -126,8 +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}, + "x86_sse3": {"ifeq ($(ARCH_X86_HAVE_SSE3),true)", "x86", false}, + "x86_sse4": {"ifeq ($(ARCH_X86_HAVE_SSE4),true)", "x86", false}, } var hostScopedPropertyConditionals = map[string]string{