From 68b246401de6132861b12d28581628ccaa780ca9 Mon Sep 17 00:00:00 2001
From: Calin Juravle <calin@google.com>
Date: Tue, 19 Aug 2014 20:28:08 +0100
Subject: [PATCH] Push ISA features into system properties

We need to know instruction set featues at runtime as well so that the
apps get compiled on target with the proper features. The properties are
read by installd and passed to dex2oat.

Bug: 16716262

(cherry picked from commit 28be9d8884861f70fbd39b3768a6d4b34009deed)

Change-Id: I45b363558dea17e9b049e4a83a55990b4911d9d8
---
 core/main.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/core/main.mk b/core/main.mk
index 562c3efe7..d719b38ba 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -312,6 +312,11 @@ ifneq ($(filter sdk win_sdk sdk_addon,$(MAKECMDGOALS)),)
 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))
-- 
2.11.0