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

Commit 708b56ed authored by Christopher Ferris's avatar Christopher Ferris Committed by Gerrit Code Review
Browse files

Merge "Make sure DEX2OAT_TARGET_CPU_VARIANT is not empty."

parents 9a0382ff 9de4d5eb

core/config.mk

+8 −0
Original line number Diff line number Diff line
@@ -546,7 +546,15 @@ endif 


# Flags for DEX2OAT

DEX2OAT_TARGET_ARCH := $(TARGET_ARCH)

ifeq ($(TARGET_CPU_VARIANT),)

ifeq ($(TARGET_ARCH_VARIANT),)

DEX2OAT_TARGET_CPU_VARIANT := default

else

DEX2OAT_TARGET_CPU_VARIANT := $(TARGET_ARCH_VARIANT)

endif

else

DEX2OAT_TARGET_CPU_VARIANT := $(TARGET_CPU_VARIANT)

endif

DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES := default



ifdef TARGET_2ND_ARCH