commit 014a3c0d6268c5e167a8fad39c8d24b962101d0a
author Dave Allison <dallison@google.com> Thu Oct 31 11:44:47 2013 -0700
committer Brian Carlstrom <bdc@google.com> Mon Nov 25 12:27:24 2013 -0800
tree e3fbc5e9e0645d64252750f3f0ea68a6a9bfabd8
parent 3821622fc7e6ed03973d4b85a10ad23261ba12ef

Add support for instruction set features

This adds the --instruction-set-features= arguments to the dex2oat
commands for the system images.  The feature set is determined at
build time

(cherry picked from commit 4145a2a20a0f275fe4c77e39d507cd5f8eb7a73b)

(cherry picked from commit 5174bb052986e9d90b597824a7e7b9ee2dfc8668)

Change-Id: I45af3b59752a48897bff2dd468b74f3ea73000be

core/dex_preopt.mk

diff --git a/core/dex_preopt.mk b/core/dex_preopt.mk
index e2e76b8..34150ff 100644
--- a/core/dex_preopt.mk
+++ b/core/dex_preopt.mk
@@ -82,3 +82,8 @@
 endef
 
 $(eval $(call _build-dexpreopt-boot-jar-dependency))
+
+DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES := default
+ifeq ($(TARGET_CPU_VARIANT),$(filter $(TARGET_CPU_VARIANT),cortex-a15 krait))
+DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES := div
+endif