diff options
| -rw-r--r-- | build/Android.gtest.mk | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk index f76ca02610..8a6d52dc82 100644 --- a/build/Android.gtest.mk +++ b/build/Android.gtest.mk @@ -423,7 +423,7 @@ LOCAL_CPP_EXTENSION := cc LOCAL_SRC_FILES := runtime/common_runtime_test.cc compiler/common_compiler_test.cc LOCAL_C_INCLUDES := $(ART_C_INCLUDES) art/runtime art/cmdline art/compiler LOCAL_SHARED_LIBRARIES := libartd libartd-compiler libdl -LOCAL_STATIC_LIBRARIES += libgtest +LOCAL_WHOLE_STATIC_LIBRARIES += libgtest LOCAL_ADDITIONAL_DEPENDENCIES := art/build/Android.common_build.mk LOCAL_ADDITIONAL_DEPENDENCIES += art/build/Android.gtest.mk $(eval LOCAL_CLANG := $(ART_TARGET_CLANG)) @@ -440,7 +440,7 @@ LOCAL_ASFLAGS := $(ART_HOST_ASFLAGS) LOCAL_SRC_FILES := runtime/common_runtime_test.cc compiler/common_compiler_test.cc LOCAL_C_INCLUDES := $(ART_C_INCLUDES) art/runtime art/cmdline art/compiler LOCAL_SHARED_LIBRARIES := libartd libartd-compiler -LOCAL_STATIC_LIBRARIES := libgtest_host +LOCAL_WHOLE_STATIC_LIBRARIES := libgtest LOCAL_LDLIBS += -ldl -lpthread LOCAL_MULTILIB := both LOCAL_CLANG := $(ART_HOST_CLANG) @@ -635,7 +635,6 @@ define define-art-gtest LOCAL_SRC_FILES := $$(art_gtest_filename) LOCAL_C_INCLUDES += $$(ART_C_INCLUDES) art/runtime art/cmdline $$(art_gtest_extra_c_includes) LOCAL_SHARED_LIBRARIES += libartd $$(art_gtest_extra_shared_libraries) libart-gtest libartd-disassembler - LOCAL_STATIC_LIBRARIES += libgtest LOCAL_WHOLE_STATIC_LIBRARIES += libsigchain LOCAL_ADDITIONAL_DEPENDENCIES := art/build/Android.common_build.mk |