diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-03-25 23:56:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-03-25 23:56:16 +0000 |
| commit | 909f133bc938928a2403baccc983701cb9ebb17f (patch) | |
| tree | c2536895986573007b316fe77b7068f93c505cd3 | |
| parent | c92492fc2565515ac5d68a8443efa91ba189b404 (diff) | |
| parent | 7f2e3da1052132854dcace88af75e2f5c067295d (diff) | |
| download | art-909f133bc938928a2403baccc983701cb9ebb17f.zip art-909f133bc938928a2403baccc983701cb9ebb17f.tar.gz art-909f133bc938928a2403baccc983701cb9ebb17f.tar.bz2 | |
Merge "Fix host gtests compiled with gcc"
| -rw-r--r-- | build/Android.gtest.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk index 21c9e6e..62916e3 100644 --- a/build/Android.gtest.mk +++ b/build/Android.gtest.mk @@ -171,7 +171,11 @@ define build-art-test LOCAL_CLANG := $(ART_HOST_CLANG) LOCAL_CFLAGS += $(ART_HOST_CFLAGS) $(ART_HOST_DEBUG_CFLAGS) LOCAL_SHARED_LIBRARIES += libicuuc-host libicui18n-host libnativehelper libz-host - LOCAL_STATIC_LIBRARIES += libcutils libgtest_host + LOCAL_STATIC_LIBRARIES += libcutils + ifneq ($(WITHOUT_HOST_CLANG),true) + # GCC host compiled tests fail with this linked, presumably due to destructors that run. + LOCAL_STATIC_LIBRARIES += libgtest_host + endif include $(BUILD_HOST_EXECUTABLE) art_gtest_exe := $(HOST_OUT_EXECUTABLES)/$$(LOCAL_MODULE) ART_HOST_GTEST_EXECUTABLES += $$(art_gtest_exe) |