diff options
| author | Gilad Arnold <garnold@google.com> | 2015-08-07 20:08:03 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-07 20:08:03 +0000 |
| commit | 573eb2a7523a8b09bdd1c3063e133643b157a673 (patch) | |
| tree | e56d471de89c24df292add0ec4dec9100686fc07 | |
| parent | ad9d9e4f62e8705cb7df4b5b8a521450da13c831 (diff) | |
| parent | 92f488a5787170b385cc3288afd62cfcf67540a0 (diff) | |
| download | gmock-573eb2a7523a8b09bdd1c3063e133643b157a673.tar.gz | |
am 92f488a5: am b4a61987: Merge "Add RTTI support to libgmock and libgmock_host."studio-1.4
* commit '92f488a5787170b385cc3288afd62cfcf67540a0':
Add RTTI support to libgmock and libgmock_host.
| -rw-r--r-- | src/Android.mk | 2 |
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) |