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

Commit 46ba5456 authored by Christopher Ferris's avatar Christopher Ferris Committed by Android Git Automerger
Browse files

am 708b56ed: Merge "Make sure DEX2OAT_TARGET_CPU_VARIANT is not empty." 

* commit '708b56ed':
  Make sure DEX2OAT_TARGET_CPU_VARIANT is not empty.
parents e380c11d 708b56ed

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