Add allocation and garbage collection infrastructure.
Change-Id: I4b04cdfdf18afb75a7b0df87b509e8156b4a932b
diff --git a/build/Android.common.mk b/build/Android.common.mk
index 24bfe02..5dab0fd 100644
--- a/build/Android.common.mk
+++ b/build/Android.common.mk
@@ -37,12 +37,19 @@
src/dex_file.cc \
src/dex_instruction.cc \
src/dex_verifier.cc \
+ src/heap.cc \
src/jni_compiler.cc \
src/jni_internal.cc \
+ src/mark_stack.cc \
+ src/mark_sweep.cc \
src/memory_region.cc \
+ src/mspace.c \
src/object.cc \
+ src/object_bitmap.cc \
+ src/offsets.cc \
src/raw_dex_file.cc \
src/runtime.cc \
+ src/space.cc \
src/stringpiece.cc \
src/stringprintf.cc \
src/thread.cc
@@ -74,7 +81,8 @@
src/dex_instruction_visitor_test.cc \
src/jni_compiler_test.cc \
src/object_test.cc \
- src/raw_dex_file_test.cc
+ src/raw_dex_file_test.cc \
+ src/space_test.cc
TEST_TARGET_SRC_FILES := \
$(TEST_COMMON_SRC_FILES) \
diff --git a/build/Android.libart.host.mk b/build/Android.libart.host.mk
index 0cf87cf..92cc4da 100644
--- a/build/Android.libart.host.mk
+++ b/build/Android.libart.host.mk
@@ -20,7 +20,6 @@
LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := $(LIBART_HOST_SRC_FILES)
LOCAL_CFLAGS := $(ART_CFLAGS)
-LOCAL_WHOLE_STATIC_LIBRARIES := libcutils
LOCAL_SHARED_LIBRARIES := liblog libz-host
LOCAL_LDLIBS := -ldl -lpthread -lrt
include $(BUILD_HOST_SHARED_LIBRARY)