Move compiler_llvm to art::llvm.
Also move the invoke stubs (soon to be removed) under compiler.
Start moving LLVM code under compiler. Will move GBC expander to dex/portable
once it is disentangled from other builds (moving toward solving Bug: 8195425).
Change-Id: I8829f9db6ade9ac8e32bd16198b90f83619769f1
diff --git a/build/Android.common.mk b/build/Android.common.mk
index 66bfb7f..f30cf01 100644
--- a/build/Android.common.mk
+++ b/build/Android.common.mk
@@ -141,8 +141,8 @@
src/common_throws.cc \
src/compiled_method.cc \
src/compiler/driver/compiler_driver.cc \
- src/compiler_llvm/procedure_linkage_table.cc \
- src/compiler_llvm/runtime_support_llvm.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 \
diff --git a/build/Android.libart-compiler.mk b/build/Android.libart-compiler.mk
index fd59927..9e11e22 100644
--- a/build/Android.libart-compiler.mk
+++ b/build/Android.libart-compiler.mk
@@ -48,29 +48,29 @@
src/compiler/dex/ralloc.cc \
src/compiler/dex/ssa_transformation.cc \
src/compiler/dex/write_elf.cc \
+ src/compiler/invoke_stubs/portable/stub_compiler.cc \
+ src/compiler/invoke_stubs/quick/jni_internal_arm.cc \
+ src/compiler/invoke_stubs/quick/jni_internal_mips.cc \
+ src/compiler/invoke_stubs/quick/jni_internal_x86.cc \
src/compiler/jni/portable/jni_compiler.cc \
src/compiler/jni/quick/arm/calling_convention_arm.cc \
src/compiler/jni/quick/mips/calling_convention_mips.cc \
src/compiler/jni/quick/x86/calling_convention_x86.cc \
src/compiler/jni/quick/calling_convention.cc \
src/compiler/jni/quick/jni_compiler.cc \
- src/compiler_llvm/compiler_llvm.cc \
- src/compiler_llvm/gbc_expander.cc \
- src/compiler_llvm/generated/art_module.cc \
- src/compiler_llvm/intrinsic_helper.cc \
- src/compiler_llvm/ir_builder.cc \
- src/compiler_llvm/llvm_compilation_unit.cc \
- src/compiler_llvm/md_builder.cc \
- src/compiler_llvm/runtime_support_builder.cc \
- src/compiler_llvm/runtime_support_builder_arm.cc \
- 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/elf_writer.cc \
- src/oat/jni/arm/jni_internal_arm.cc \
- src/oat/jni/mips/jni_internal_mips.cc \
- src/oat/jni/x86/jni_internal_x86.cc
+ src/compiler/llvm/compiler_llvm.cc \
+ src/compiler/llvm/gbc_expander.cc \
+ src/compiler/llvm/generated/art_module.cc \
+ src/compiler/llvm/intrinsic_helper.cc \
+ src/compiler/llvm/ir_builder.cc \
+ src/compiler/llvm/llvm_compilation_unit.cc \
+ src/compiler/llvm/md_builder.cc \
+ src/compiler/llvm/runtime_support_builder.cc \
+ src/compiler/llvm/runtime_support_builder_arm.cc \
+ src/compiler/llvm/runtime_support_builder_thumb2.cc \
+ src/compiler/llvm/runtime_support_builder_x86.cc \
+ src/compiler/llvm/runtime_support_llvm.cc \
+ src/elf_writer.cc
LIBART_COMPILER_CFLAGS :=
ifeq ($(ART_USE_PORTABLE_COMPILER),true)