diff options
| author | Brian Carlstrom <bdc@google.com> | 2015-01-09 18:02:20 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-09 18:02:20 +0000 |
| commit | d169346b055eaac6897c3edac9a77042fceb11b2 (patch) | |
| tree | 7ff447d8727e8183b59b73041f2f97d454067851 /target/board | |
| parent | de00ebbe24185237a1056fde39cfc839534e31da (diff) | |
| parent | 7a1125bc632e150b934538036102807374406d2f (diff) | |
| download | build-d169346b055eaac6897c3edac9a77042fceb11b2.zip build-d169346b055eaac6897c3edac9a77042fceb11b2.tar.gz build-d169346b055eaac6897c3edac9a77042fceb11b2.tar.bz2 | |
am 7a1125bc: Merge "Make TARGET_CPU_VARIANT the same as TARGET_ARCH_VARIANT for Mips."
* commit '7a1125bc632e150b934538036102807374406d2f':
Make TARGET_CPU_VARIANT the same as TARGET_ARCH_VARIANT for Mips.
Diffstat (limited to 'target/board')
| -rw-r--r-- | target/board/generic_mips/BoardConfig.mk | 3 | ||||
| -rw-r--r-- | target/board/generic_mips64/BoardConfig.mk | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/target/board/generic_mips/BoardConfig.mk b/target/board/generic_mips/BoardConfig.mk index dbc715a..736ad7f 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 f8cf4f0..caebacc 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 |