diff options
| author | Elliott Hughes <enh@google.com> | 2012-03-09 17:36:50 -0800 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2012-03-09 17:36:50 -0800 |
| commit | 46f060a53fffc14333096f0a48f95730ee4768ee (patch) | |
| tree | e29bd9d927e315191840e81fd1ddbcfbddaa04cc /build | |
| parent | b3cd1229e6904365ca0ca2a7bbc4701ad1908154 (diff) | |
| download | art-46f060a53fffc14333096f0a48f95730ee4768ee.zip art-46f060a53fffc14333096f0a48f95730ee4768ee.tar.gz art-46f060a53fffc14333096f0a48f95730ee4768ee.tar.bz2 | |
Move other compiler bits into the compiler shared libraries.
Change-Id: I288337af4c70716709217ff2d21050ba5f858807
Diffstat (limited to 'build')
| -rw-r--r-- | build/Android.common.mk | 6 | ||||
| -rw-r--r-- | build/Android.libart-compiler.mk | 5 |
2 files changed, 4 insertions, 7 deletions
diff --git a/build/Android.common.mk b/build/Android.common.mk index 0ab796a..7d9ef81 100644 --- a/build/Android.common.mk +++ b/build/Android.common.mk @@ -218,12 +218,6 @@ LIBART_COMMON_SRC_FILES += \ src/compiler_llvm/runtime_support_llvm.cc \ src/compiler_llvm/upcall_compiler.cc \ src/compiler_llvm/utils_llvm.cc -else -# TODO: should these be in libart-compiler.so instead? -LIBART_COMMON_SRC_FILES += \ - src/jni_compiler.cc \ - src/jni_internal_arm.cc \ - src/jni_internal_x86.cc endif LIBART_TARGET_SRC_FILES := \ diff --git a/build/Android.libart-compiler.mk b/build/Android.libart-compiler.mk index a9108e0..01d9c12 100644 --- a/build/Android.libart-compiler.mk +++ b/build/Android.libart-compiler.mk @@ -21,10 +21,12 @@ LIBART_COMPILER_COMMON_SRC_FILES += \ src/compiler/Ralloc.cc \ src/compiler/SSATransformation.cc \ src/compiler/Utility.cc \ - src/compiler/codegen/RallocUtil.cc + src/compiler/codegen/RallocUtil.cc \ + src/jni_compiler.cc LIBART_COMPILER_ARM_SRC_FILES += \ $(LIBART_COMPILER_COMMON_SRC_FILES) \ + src/jni_internal_arm.cc \ src/compiler/codegen/arm/ArchUtility.cc \ src/compiler/codegen/arm/ArmRallocUtil.cc \ src/compiler/codegen/arm/Assemble.cc \ @@ -39,6 +41,7 @@ LIBART_COMPILER_MIPS_SRC_FILES += \ LIBART_COMPILER_X86_SRC_FILES += \ $(LIBART_COMPILER_COMMON_SRC_FILES) \ + src/jni_internal_x86.cc \ src/compiler/codegen/x86/ArchUtility.cc \ src/compiler/codegen/x86/X86RallocUtil.cc \ src/compiler/codegen/x86/Assemble.cc \ |