commit e8892aa4ec043fa86fe6c0dbe58f8586fd636bcd
author Calin Juravle <calin@google.com> Tue Aug 26 17:34:42 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 26 17:34:42 2014 +0000
tree d0d8ac31972a31d0cfcb948e5df1129e6ef90347
parent da2da1d9b858c7f63290614fc07c1a6de65eb031
parent 28be9d8884861f70fbd39b3768a6d4b34009deed

Merge "Push ISA features into system properties" into lmp-dev

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index f33574b..fcddf89 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -308,6 +308,11 @@
 is_sdk_build := true
 endif
 
+ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.isa.$(TARGET_ARCH).features=$(DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES)
+ifdef TARGET_2ND_ARCH
+ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.isa.$(TARGET_2ND_ARCH).features=$($(TARGET_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES)
+endif
+
 ## user/userdebug ##
 
 user_variant := $(filter user userdebug,$(TARGET_BUILD_VARIANT))