summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2016-08-23 01:30:26 +0000
committer android-build-merger <android-build-merger@google.com> 2016-08-23 01:30:26 +0000
commit017fb2931de3246966ccb6b3f07ff9387b2930bb (patch)
tree9abbab933a2a2e789cc5dcfe8489807d4bc25aea
parent441ee4006ab84834114554aca49a57302ebcb7de (diff)
parent48d2b14feb749c9160eb4af3e870ed935a1c6455 (diff)
Merge "Fix build"
am: 48d2b14feb Change-Id: I545501b86800329f2540b25a35cf1473f36e9076
-rw-r--r--compiler/Android.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/Android.mk b/compiler/Android.mk
index 410b2d05f2..16c6a7b2ce 100644
--- a/compiler/Android.mk
+++ b/compiler/Android.mk
@@ -92,6 +92,8 @@ LIBART_COMPILER_SRC_FILES_arm := \
linker/arm/relative_patcher_thumb2.cc \
optimizing/code_generator_arm.cc \
optimizing/dex_cache_array_fixups_arm.cc \
+ optimizing/instruction_simplifier_arm.cc \
+ optimizing/instruction_simplifier_shared.cc \
optimizing/intrinsics_arm.cc \
utils/arm/assembler_arm.cc \
utils/arm/assembler_arm32.cc \
@@ -109,7 +111,6 @@ LIBART_COMPILER_SRC_FILES_arm64 := \
linker/arm64/relative_patcher_arm64.cc \
optimizing/nodes_arm64.cc \
optimizing/code_generator_arm64.cc \
- optimizing/instruction_simplifier_arm.cc \
optimizing/instruction_simplifier_arm64.cc \
optimizing/instruction_simplifier_shared.cc \
optimizing/intrinsics_arm64.cc \