diff options
author | Ian Rogers <irogers@google.com> | 2014-10-17 07:44:19 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-17 07:44:19 +0000 |
commit | 7e771594ce62b3d869e90831a24fa5a8956525cc (patch) | |
tree | 11d828a1f15025a6cc5e417f1777239aec6d37bb | |
parent | e453f5fae32abd147adc1e774fe4290f726e4d97 (diff) | |
parent | 0251f3454e5f4716716673f2df1becd0730fbc79 (diff) | |
download | build-7e771594ce62b3d869e90831a24fa5a8956525cc.zip build-7e771594ce62b3d869e90831a24fa5a8956525cc.tar.gz build-7e771594ce62b3d869e90831a24fa5a8956525cc.tar.bz2 |
am 0251f345: am fc82be6e: Merge "Add LPAE to dex2oat ISA feature list."
* commit '0251f3454e5f4716716673f2df1becd0730fbc79':
Add LPAE to dex2oat ISA feature list.
-rw-r--r-- | core/config.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/config.mk b/core/config.mk index bfa5610..3ceb392 100644 --- a/core/config.mk +++ b/core/config.mk @@ -552,7 +552,7 @@ DEX2OAT_TARGET_ARCH := $(TARGET_ARCH) DEX2OAT_TARGET_CPU_VARIANT := $(TARGET_CPU_VARIANT) DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES := default ifneq (,$(filter $(DEX2OAT_TARGET_CPU_VARIANT),cortex-a7 cortex-a15 krait denver)) - DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES := div + DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES := lpae,div endif ifdef TARGET_2ND_ARCH @@ -560,7 +560,7 @@ $(TARGET_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_ARCH := $(TARGET_2ND_ARCH) $(TARGET_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_CPU_VARIANT := $(TARGET_2ND_CPU_VARIANT) $(TARGET_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES := default ifneq (,$(filter $($(TARGET_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_CPU_VARIANT),cortex-a7 cortex-a15 krait denver)) - $(TARGET_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES := div + $(TARGET_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES := lpae,div endif endif |