aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilad Arnold <garnold@google.com>2015-08-07 20:20:58 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-07 20:20:58 +0000
commit0797b0e5d5d352ebe2bef6147bdf3e20c99f770c (patch)
treee56d471de89c24df292add0ec4dec9100686fc07
parent830d4aaa0c9fb4b5f735e50f81443283062466e3 (diff)
parent92f488a5787170b385cc3288afd62cfcf67540a0 (diff)
downloadgmock-0797b0e5d5d352ebe2bef6147bdf3e20c99f770c.tar.gz
am 92f488a5: am b4a61987: Merge "Add RTTI support to libgmock and libgmock_host."brillo-m7-releasebrillo-m7-mr-devbrillo-m7-dev
* commit '92f488a5787170b385cc3288afd62cfcf67540a0': Add RTTI support to libgmock and libgmock_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 a36d50c..5469970 100644
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -94,6 +94,7 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/../include
LOCAL_MODULE := libgmock_host
LOCAL_MULTILIB := both
LOCAL_SANITIZE := never
+LOCAL_RTTI_FLAG := -frtti
include $(BUILD_HOST_STATIC_LIBRARY)
@@ -127,6 +128,7 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/../include
LOCAL_CFLAGS += $(libgmock_cflags)
LOCAL_MODULE := libgmock
LOCAL_SANITIZE := never
+LOCAL_RTTI_FLAG := -frtti
include $(BUILD_STATIC_LIBRARY)