tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge changes I65c3fa9a,Id1ea5e8b am: 126ea5a55c

Browse source 
am: 7363b91cb1

Change-Id: I5496223f82953429717dfb185b8ee34074fa11c4
This commit is contained in:
Duane Sand 2016-09-06 22:54:01 +00:00 committed by android-build-merger
commit c2793b97e9
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,3 +1,3 @@
# 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
ifeq (,$(TARGET_2ND_ARCH_VARIANT))
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
TARGET_2ND_ARCH_VARIANT := mips32r2-fp
endif