From 3cf3d78600f327cd57c2ae3bc936309f15cbe5c1 Mon Sep 17 00:00:00 2001 From: Douglas Leung Date: Wed, 7 Jan 2015 16:29:39 -0800 Subject: [PATCH] Make TARGET_CPU_VARIANT the same as TARGET_ARCH_VARIANT for Mips. This is used to set --instruction-set-variant for dex2oat. Change-Id: Ic93d1bfab634489e004ccf1195cdcfc767f092ef --- target/board/generic_mips/BoardConfig.mk | 3 +++ target/board/generic_mips64/BoardConfig.mk | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/target/board/generic_mips/BoardConfig.mk b/target/board/generic_mips/BoardConfig.mk index dbc715a8d6..736ad7f74a 100644 --- a/target/board/generic_mips/BoardConfig.mk +++ b/target/board/generic_mips/BoardConfig.mk @@ -28,6 +28,9 @@ TARGET_ARCH_VARIANT := mips32r2-fp endif TARGET_CPU_ABI := mips +# Make TARGET_CPU_VARIANT the same as TARGET_ARCH_VARIANT +TARGET_CPU_VARIANT := $(TARGET_ARCH_VARIANT) + HAVE_HTC_AUDIO_DRIVER := true BOARD_USES_GENERIC_AUDIO := true diff --git a/target/board/generic_mips64/BoardConfig.mk b/target/board/generic_mips64/BoardConfig.mk index f8cf4f03a7..caebacc76d 100644 --- a/target/board/generic_mips64/BoardConfig.mk +++ b/target/board/generic_mips64/BoardConfig.mk @@ -38,6 +38,10 @@ endif endif TARGET_2ND_CPU_ABI := mips +# Make TARGET_XXX_CPU_VARIANT the same as TARGET_XXX_ARCH_VARIANT +TARGET_CPU_VARIANT := $(TARGET_ARCH_VARIANT) +TARGET_2ND_CPU_VARIANT := $(TARGET_2ND_ARCH_VARIANT) + # The emulator (qemu) uses the Goldfish devices HAVE_HTC_AUDIO_DRIVER := true BOARD_USES_GENERIC_AUDIO := true