diff options
| author | Andreas Gampe <agampe@google.com> | 2014-11-13 19:10:33 -0800 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2014-11-13 19:12:07 -0800 |
| commit | 72a122c33dadde5661a39aaa0a10bc1dbff16ce6 (patch) | |
| tree | 1ab83f991429c6737f154ea1f371bb3f06e9f82e /runtime/Android.mk | |
| parent | 0e57decfd5e56f12f42c9663f8e6147237b86039 (diff) | |
| download | art-72a122c33dadde5661a39aaa0a10bc1dbff16ce6.tar.gz art-72a122c33dadde5661a39aaa0a10bc1dbff16ce6.tar.bz2 art-72a122c33dadde5661a39aaa0a10bc1dbff16ce6.zip | |
ART: Fix last lpae occurrence, Arm64 generic
Fix the last occurrence of an lpae string in the default
instruction-set-feature strings (should be removed).
Allow "generic" Arm64 variant (same as "default").
Change-Id: I8bdd9fc7f596245e6541469664db01b3e781c51c
Diffstat (limited to 'runtime/Android.mk')
| -rw-r--r-- | runtime/Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/Android.mk b/runtime/Android.mk index 8ced4d9d61..25fe45f5cd 100644 --- a/runtime/Android.mk +++ b/runtime/Android.mk @@ -344,7 +344,7 @@ LIBART_TARGET_DEFAULT_INSTRUCTION_SET_FEATURES := default 2ND_LIBART_TARGET_DEFAULT_INSTRUCTION_SET_FEATURES := default ifeq ($(DEX2OAT_TARGET_ARCH),arm) ifneq (,$(filter $(DEX2OAT_TARGET_CPU_VARIANT),cortex-a15 krait denver)) - LIBART_TARGET_DEFAULT_INSTRUCTION_SET_FEATURES := lpae,div + LIBART_TARGET_DEFAULT_INSTRUCTION_SET_FEATURES := atomic_ldrd_strd,div else ifneq (,$(filter $(DEX2OAT_TARGET_CPU_VARIANT),cortex-a7)) LIBART_TARGET_DEFAULT_INSTRUCTION_SET_FEATURES := div @@ -353,7 +353,7 @@ ifeq ($(DEX2OAT_TARGET_ARCH),arm) endif ifeq ($(2ND_DEX2OAT_TARGET_ARCH),arm) ifneq (,$(filter $(DEX2OAT_TARGET_CPU_VARIANT),cortex-a15 krait denver)) - 2ND_LIBART_TARGET_DEFAULT_INSTRUCTION_SET_FEATURES := lpae,div + 2ND_LIBART_TARGET_DEFAULT_INSTRUCTION_SET_FEATURES := atomic_ldrd_strd,div else ifneq (,$(filter $(DEX2OAT_TARGET_CPU_VARIANT),cortex-a7)) 2ND_LIBART_TARGET_DEFAULT_INSTRUCTION_SET_FEATURES := div |