Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec26fd75 authored by Duane Sand's avatar Duane Sand Committed by android-build-merger
Browse files

Merge changes I65c3fa9a,Id1ea5e8b am: 126ea5a5 am: 7363b91c 

am: c2793b97

Change-Id: I79f3a7c39f23a0f24cdacce3034ed9571bcc7faf
parents 9457cbe8 c2793b97

core/combo/arch/mips64/mips64r6.mk

+1 −1
Original line number Diff line number Diff line 
# Configuration for Android on mips64r6.



ARCH_MIPS_REV6 := true
 
ARCH_MIPS64_REV6 := true

target/board/generic_mips64/BoardConfig.mk

+4 −1
Original line number Diff line number Diff line
@@ -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