summaryrefslogtreecommitdiffstats
path: root/core/config.mk
diff options
context:
space:
mode:
Diffstat (limited to 'core/config.mk')
-rw-r--r--core/config.mk8
1 files changed, 8 insertions, 0 deletions
diff --git a/core/config.mk b/core/config.mk
index e8b6504..d6449d5 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -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