Always compile compiler_llvm files.
Build fix.
Change-Id: I7dec1350345ffe2ed60a498896eda3854b0c75ff
diff --git a/build/Android.common.mk b/build/Android.common.mk
index dd83136..b9b5298 100644
--- a/build/Android.common.mk
+++ b/build/Android.common.mk
@@ -141,6 +141,8 @@
src/common_throws.cc \
src/compiled_method.cc \
src/compiler.cc \
+ src/compiler_llvm/procedure_linkage_table.cc \
+ src/compiler_llvm/runtime_support_llvm.cc \
src/debugger.cc \
src/dex_file.cc \
src/dex_file_verifier.cc \
@@ -252,12 +254,6 @@
src/well_known_classes.cc \
src/zip_archive.cc
-ifeq ($(ART_USE_PORTABLE_COMPILER),true)
-LIBART_COMMON_SRC_FILES += \
- src/compiler_llvm/procedure_linkage_table.cc \
- src/compiler_llvm/runtime_support_llvm.cc
-endif
-
LIBART_COMMON_SRC_FILES += \
src/oat/runtime/context.cc \
src/oat/runtime/support_alloc.cc \
diff --git a/build/Android.libart-compiler.mk b/build/Android.libart-compiler.mk
index fae6009..836a78a 100644
--- a/build/Android.libart-compiler.mk
+++ b/build/Android.libart-compiler.mk
@@ -48,23 +48,6 @@
src/compiler/dex/ralloc.cc \
src/compiler/dex/ssa_transformation.cc \
src/compiler/dex/write_elf.cc \
- src/elf_writer.cc \
- src/oat/jni/arm/calling_convention_arm.cc \
- src/oat/jni/arm/jni_internal_arm.cc \
- src/oat/jni/calling_convention.cc \
- src/oat/jni/jni_compiler.cc \
- src/oat/jni/mips/calling_convention_mips.cc \
- src/oat/jni/mips/jni_internal_mips.cc \
- src/oat/jni/x86/calling_convention_x86.cc \
- src/oat/jni/x86/jni_internal_x86.cc
-
-LIBART_COMPILER_CFLAGS :=
-ifeq ($(ART_USE_PORTABLE_COMPILER),true)
- LIBART_COMPILER_CFLAGS += -DART_USE_PORTABLE_COMPILER=1
-endif
-
-ifeq ($(ART_USE_PORTABLE_COMPILER),true)
- LIBART_COMPILER_SRC_FILES += \
src/compiler_llvm/compiler_llvm.cc \
src/compiler_llvm/gbc_expander.cc \
src/compiler_llvm/generated/art_module.cc \
@@ -78,7 +61,20 @@
src/compiler_llvm/runtime_support_builder_thumb2.cc \
src/compiler_llvm/runtime_support_builder_x86.cc \
src/compiler_llvm/runtime_support_llvm.cc \
- src/compiler_llvm/stub_compiler.cc
+ src/compiler_llvm/stub_compiler.cc \
+ src/elf_writer.cc \
+ src/oat/jni/arm/calling_convention_arm.cc \
+ src/oat/jni/arm/jni_internal_arm.cc \
+ src/oat/jni/calling_convention.cc \
+ src/oat/jni/jni_compiler.cc \
+ src/oat/jni/mips/calling_convention_mips.cc \
+ src/oat/jni/mips/jni_internal_mips.cc \
+ src/oat/jni/x86/calling_convention_x86.cc \
+ src/oat/jni/x86/jni_internal_x86.cc
+
+LIBART_COMPILER_CFLAGS :=
+ifeq ($(ART_USE_PORTABLE_COMPILER),true)
+ LIBART_COMPILER_CFLAGS += -DART_USE_PORTABLE_COMPILER=1
endif
# $(1): target or host