Merge "Select the arch_variant_cflags for the 2nd arch."

ARCH_ARM_HAVE_VFP_D32           := true

ARCH_ARM_HAVE_NEON              := true

ifeq ($(TARGET_CPU_VARIANT),$(filter $(TARGET_CPU_VARIANT),cortex-a15 krait))

ifneq (,$(filter cortex-a15 krait,$(TARGET_$(combo_2nd_arch_prefix)CPU_VARIANT)))

	arch_variant_cflags := -mcpu=cortex-a15

else

ifeq ($(strip $(TARGET_CPU_VARIANT)),cortex-a8)

ifeq ($(strip $(TARGET_$(combo_2nd_arch_prefix)CPU_VARIANT)),cortex-a8)

	arch_variant_cflags := -mcpu=cortex-a8

else

ifeq ($(strip $(TARGET_CPU_VARIANT)),cortex-a7)

ifeq ($(strip $(TARGET_$(combo_2nd_arch_prefix)CPU_VARIANT)),cortex-a7)

	arch_variant_cflags := -mcpu=cortex-a7

else

	arch_variant_cflags := -march=armv7-a