aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilad Arnold <garnold@google.com>2015-08-07 20:08:02 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-07 20:08:02 +0000
commit77e0beee994d8c99985a9646a35c1ab6cb20b06e (patch)
tree9fbca0bde65bed5fc163e4e35c88126a141ea511
parent7bdfdc80345dcaf7ba3f7c6b9327c21d16cce3f8 (diff)
parent01e30b453ed9de79e9338ff31733e045862273f6 (diff)
downloadgtest-77e0beee994d8c99985a9646a35c1ab6cb20b06e.tar.gz
am 01e30b45: Merge "Add RTTI support to libgtest and libgtest_host."
* commit '01e30b453ed9de79e9338ff31733e045862273f6': Add RTTI support to libgtest and libgtest_host.
-rw-r--r--src/Android.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/Android.mk b/src/Android.mk
index 3d377f0..5976376 100644
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -87,6 +87,7 @@ LOCAL_CFLAGS += $(libgtest_cflags)
LOCAL_MODULE := libgtest_host
LOCAL_MULTILIB := both
LOCAL_SANITIZE := never
+LOCAL_RTTI_FLAG := -frtti
include $(BUILD_HOST_STATIC_LIBRARY)
@@ -119,6 +120,7 @@ LOCAL_C_INCLUDES := $(libgtest_target_includes)
LOCAL_CFLAGS += $(libgtest_cflags)
LOCAL_MODULE := libgtest
LOCAL_SANITIZE := never
+LOCAL_RTTI_FLAG := -frtti
include $(BUILD_STATIC_LIBRARY)