am d169346b: am 7a1125bc: Merge "Make TARGET_CPU_VARIANT the same as TARGET_ARCH_VARIANT for Mips."

* commit 'd169346b055eaac6897c3edac9a77042fceb11b2':
  Make TARGET_CPU_VARIANT the same as TARGET_ARCH_VARIANT for Mips.
This commit is contained in:
Brian Carlstrom 2015-01-09 18:08:00 +00:00 committed by Android Git Automerger
commit 4d51524b64
2 changed files with 7 additions and 0 deletions

View File

@ -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

View File

@ -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