diff options
| author | Dave Allison <dallison@google.com> | 2014-04-08 23:08:12 +0000 |
|---|---|---|
| committer | Dave Allison <dallison@google.com> | 2014-04-09 13:18:07 -0700 |
| commit | f9487c039efb4112616d438593a2ab02792e0304 (patch) | |
| tree | 95f88645bec774d3e8df170bd0f40e4cd0911a34 /compiler/Android.mk | |
| parent | b24b0e2bb128532945b31ea62715776d7751f84d (diff) | |
| download | art-f9487c039efb4112616d438593a2ab02792e0304.zip art-f9487c039efb4112616d438593a2ab02792e0304.tar.gz art-f9487c039efb4112616d438593a2ab02792e0304.tar.bz2 | |
Revert "Revert "Use trampolines for calls to helpers""
This reverts commit 081f73e888b3c246cf7635db37b7f1105cf1a2ff.
Change-Id: Ibd777f8ce73cf8ed6c4cb81d50bf6437ac28cb61
Conflicts:
compiler/dex/quick/mir_to_lir.h
Diffstat (limited to 'compiler/Android.mk')
| -rw-r--r-- | compiler/Android.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/compiler/Android.mk b/compiler/Android.mk index b17cd52..29d9cc6 100644 --- a/compiler/Android.mk +++ b/compiler/Android.mk @@ -19,6 +19,8 @@ LOCAL_PATH := $(call my-dir) include art/build/Android.common.mk LIBART_COMPILER_SRC_FILES := \ + arch/arm/final_relocations_arm.cc \ + arch/arm/entrypoint_trampoline.cc \ compiled_method.cc \ dex/local_value_numbering.cc \ dex/quick/arm/assemble_arm.cc \ @@ -65,6 +67,7 @@ LIBART_COMPILER_SRC_FILES := \ dex/ssa_transformation.cc \ driver/compiler_driver.cc \ driver/dex_compilation_unit.cc \ + final_relocations.cc \ jni/quick/arm/calling_convention_arm.cc \ jni/quick/arm64/calling_convention_arm64.cc \ jni/quick/mips/calling_convention_mips.cc \ |