openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge changes I65c3fa9a,Id1ea5e8b am: 126ea5a55c am: 7363b91cb1 

am: c2793b97e9

Change-Id: I79f3a7c39f23a0f24cdacce3034ed9571bcc7faf
This commit is contained in:
Duane Sand 2016-09-06 23:06:24 +00:00 committed by android-build-merger
parent 9457cbe8c1 c2793b97e9
commit ec26fd752e
2 changed files with 5 additions and 2 deletions
core/combo/arch/mips64
mips64r6.mk
target/board/generic_mips64
BoardConfig.mk

2
core/combo/arch/mips64/mips64r6.mk
View File

@ -1,3 +1,3 @@
# Configuration for Android on mips64r6. # Configuration for Android on mips64r6.
ARCH_MIPS_REV6 := true ARCH_MIPS64_REV6 := true

5
target/board/generic_mips64/BoardConfig.mk
View File

@ -31,7 +31,10 @@ TARGET_CPU_ABI := mips64
TARGET_2ND_ARCH := mips TARGET_2ND_ARCH := mips
ifeq (,$(TARGET_2ND_ARCH_VARIANT)) ifeq (,$(TARGET_2ND_ARCH_VARIANT))
ifeq ($(TARGET_ARCH_VARIANT),mips64r6) ifeq ($(TARGET_ARCH_VARIANT),mips64r6)
TARGET_2ND_ARCH_VARIANT := mips32r6 # Imgtec builds use 32r6 arch variant with Imgtec-maintained prebuilts/ndk library:
# TARGET_2ND_ARCH_VARIANT := mips32r6
# Aosp builds lack full set of mips32r6 NDK prebuilts, so use 32r2 abi:
TARGET_2ND_ARCH_VARIANT := mips32r2-fp
else else
TARGET_2ND_ARCH_VARIANT := mips32r2-fp TARGET_2ND_ARCH_VARIANT := mips32r2-fp
endif endif