diff options
Diffstat (limited to 'build')
| -rw-r--r-- | build/Android.common.mk | 5 | ||||
| -rw-r--r-- | build/Android.gtest.mk | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/build/Android.common.mk b/build/Android.common.mk index 178af643a9..f4c7c98a5b 100644 --- a/build/Android.common.mk +++ b/build/Android.common.mk @@ -164,6 +164,7 @@ OATEXEC_SRC_FILES := \ LIBART_COMMON_SRC_FILES := \ src/atomic.cc.arm \ + src/barrier.cc \ src/check_jni.cc \ src/class_linker.cc \ src/common_throws.cc \ @@ -181,7 +182,6 @@ LIBART_COMMON_SRC_FILES := \ src/dlmalloc.cc \ src/file.cc \ src/file_linux.cc \ - src/gc/barrier.cc \ src/gc/card_table.cc \ src/gc/heap_bitmap.cc \ src/gc/large_object_space.cc \ @@ -257,6 +257,7 @@ LIBART_COMMON_SRC_FILES := \ src/stringprintf.cc \ src/thread.cc \ src/thread_list.cc \ + src/thread_pool.cc \ src/trace.cc \ src/utf.cc \ src/utils.cc \ @@ -394,6 +395,7 @@ LIBARTTEST_COMMON_SRC_FILES := \ test/ReferenceMap/stack_walk_refmap_jni.cc TEST_COMMON_SRC_FILES := \ + src/barrier_test.cc \ src/class_linker_test.cc \ src/compiler_test.cc \ src/dex_cache_test.cc \ @@ -418,6 +420,7 @@ TEST_COMMON_SRC_FILES := \ src/reference_table_test.cc \ src/runtime_support_test.cc \ src/runtime_test.cc \ + src/thread_pool_test.cc \ src/utils_test.cc \ src/zip_archive_test.cc \ src/verifier/method_verifier_test.cc \ diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk index de8c502b7a..6d865dc887 100644 --- a/build/Android.gtest.mk +++ b/build/Android.gtest.mk @@ -77,7 +77,7 @@ define build-art-test LOCAL_CFLAGS := $(ART_TEST_CFLAGS) ifeq ($$(art_target_or_host),target) LOCAL_CFLAGS += $(ART_TARGET_CFLAGS) $(ART_TARGET_DEBUG_CFLAGS) - LOCAL_SHARED_LIBRARIES += libdl libicuuc libicui18n libnativehelper libstlport libz + LOCAL_SHARED_LIBRARIES += libdl libicuuc libicui18n libnativehelper libstlport libz libcutils LOCAL_STATIC_LIBRARIES += libgtest LOCAL_MODULE_PATH := $(ART_NATIVETEST_OUT) include $(BUILD_EXECUTABLE) @@ -86,6 +86,7 @@ define build-art-test else # host LOCAL_CFLAGS += $(ART_HOST_CFLAGS) $(ART_HOST_DEBUG_CFLAGS) LOCAL_SHARED_LIBRARIES += libicuuc-host libicui18n-host libnativehelper libz-host + LOCAL_STATIC_LIBRARIES += libcutils ifeq ($(HOST_OS),darwin) # Mac OS complains about unresolved symbols if you don't include this. LOCAL_WHOLE_STATIC_LIBRARIES := libgtest_host |