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

Commit 0251f345 authored by Ian Rogers's avatar Ian Rogers Committed by Android Git Automerger
Browse files

am fc82be6e: Merge "Add LPAE to dex2oat ISA feature list." 

* commit 'fc82be6e':
  Add LPAE to dex2oat ISA feature list.
parents b3f42ed0 fc82be6e

core/config.mk

+2 −2
Original line number Diff line number Diff line
@@ -533,7 +533,7 @@ DEX2OAT_TARGET_ARCH := $(TARGET_ARCH) 
DEX2OAT_TARGET_CPU_VARIANT := $(TARGET_CPU_VARIANT)

DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES := default

ifneq (,$(filter $(DEX2OAT_TARGET_CPU_VARIANT),cortex-a7 cortex-a15 krait denver))

  DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES := div

  DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES := lpae,div

endif



ifdef TARGET_2ND_ARCH
@@ -541,7 +541,7 @@ $(TARGET_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_ARCH := $(TARGET_2ND_ARCH) 
$(TARGET_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_CPU_VARIANT := $(TARGET_2ND_CPU_VARIANT)

$(TARGET_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES := default

ifneq (,$(filter $($(TARGET_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_CPU_VARIANT),cortex-a7 cortex-a15 krait denver))

  $(TARGET_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES := div

  $(TARGET_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES := lpae,div

endif

endif