libart-compiler cleanup
- Move compile-time code to src/compiler and libart-compiler
OatWriter, ImageWriter, ElfWriter, ElfFixup, ElfStripper, stub generation
- Move ClassReference and MethodReference to remove MethodVerifier dependency on CompilerDriver
- Move runtime_support_llvm.cc out of src/compiler and next to runtime_support.cc
- Change dex2oat and gtests to directly depend on libart-compiler
- Move non-common definitions from Android.common.mk to more specific makefiles
- Add LOCAL_ADDITIONAL_DEPENDENCIES on appropriate makefiles
Change-Id: I897027e69945914128f21f317a92caf9255bc600
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index f13c47e..8b65efd 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -14,6 +14,54 @@
# limitations under the License.
#
+TEST_COMMON_SRC_FILES := \
+ src/barrier_test.cc \
+ src/base/histogram_test.cc \
+ src/base/mutex_test.cc \
+ src/base/unix_file/fd_file_test.cc \
+ src/base/unix_file/mapped_file_test.cc \
+ src/base/unix_file/null_file_test.cc \
+ src/base/unix_file/random_access_file_utils_test.cc \
+ src/base/unix_file/string_file_test.cc \
+ src/class_linker_test.cc \
+ src/compiler/driver/compiler_driver_test.cc \
+ src/compiler/elf_writer_test.cc \
+ src/compiler/jni/jni_compiler_test.cc \
+ src/dex_file_test.cc \
+ src/dex_instruction_visitor_test.cc \
+ src/dex_method_iterator_test.cc \
+ src/exception_test.cc \
+ src/gc/accounting/space_bitmap_test.cc \
+ src/gc/heap_test.cc \
+ src/gc/space/space_test.cc \
+ src/gtest_test.cc \
+ src/image_test.cc \
+ src/indenter_test.cc \
+ src/indirect_reference_table_test.cc \
+ src/intern_table_test.cc \
+ src/jni_internal_test.cc \
+ src/mirror/dex_cache_test.cc \
+ src/mirror/object_test.cc \
+ src/oat/utils/arm/managed_register_arm_test.cc \
+ src/oat/utils/x86/managed_register_x86_test.cc \
+ src/oat_test.cc \
+ src/output_stream_test.cc \
+ src/reference_table_test.cc \
+ src/runtime_support_test.cc \
+ src/runtime_test.cc \
+ src/thread_pool_test.cc \
+ src/utils_test.cc \
+ src/verifier/method_verifier_test.cc \
+ src/verifier/reg_type_test.cc \
+ src/zip_archive_test.cc
+
+TEST_TARGET_SRC_FILES := \
+ $(TEST_COMMON_SRC_FILES)
+
+TEST_HOST_SRC_FILES := \
+ $(TEST_COMMON_SRC_FILES) \
+ src/oat/utils/x86/assembler_x86_test.cc
+
ART_HOST_TEST_EXECUTABLES :=
ART_TARGET_TEST_EXECUTABLES :=
ART_HOST_TEST_TARGETS :=
@@ -50,7 +98,9 @@
endif
LOCAL_SRC_FILES := $$(art_gtest_filename) src/common_test.cc
LOCAL_C_INCLUDES += $(ART_C_INCLUDES)
- LOCAL_SHARED_LIBRARIES := libartd
+ LOCAL_SHARED_LIBRARIES := libartd-compiler libartd
+ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/build/Android.common.mk
+ LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/build/Android.gtest.mk
# Mac OS linker doesn't understand --export-dynamic.
ifneq ($(HOST_OS)-$$(art_target_or_host),darwin-host)