diff options
| author | Calin Juravle <calin@google.com> | 2014-08-26 17:34:42 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-26 17:34:42 +0000 |
| commit | e8892aa4ec043fa86fe6c0dbe58f8586fd636bcd (patch) | |
| tree | d0d8ac31972a31d0cfcb948e5df1129e6ef90347 /core | |
| parent | da2da1d9b858c7f63290614fc07c1a6de65eb031 (diff) | |
| parent | 28be9d8884861f70fbd39b3768a6d4b34009deed (diff) | |
| download | build-e8892aa4ec043fa86fe6c0dbe58f8586fd636bcd.zip build-e8892aa4ec043fa86fe6c0dbe58f8586fd636bcd.tar.gz build-e8892aa4ec043fa86fe6c0dbe58f8586fd636bcd.tar.bz2 | |
Merge "Push ISA features into system properties" into lmp-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/main.mk | 5 |
1 files changed, 5 insertions, 0 deletions
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 @@ 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)) |