am 04c0ae3c: am f6ec81ff: Updated gMock to 1.7.0

* commit '04c0ae3c65f025b6ec5ef752ce0054e04b414ed4': Updated gMock to 1.7.0
2014-03-10 18:59:18 +00:00
parent 0444a6499f 04c0ae3c65
commit c4cd207d82
34 changed files with 3493 additions and 1629 deletions
--- a/libwvdrmengine/cdm/test/unit-test.mk
+++ b/libwvdrmengine/cdm/test/unit-test.mk
@@ -51,4 +51,9 @@ LOCAL_SHARED_LIBRARIES := \
    libstlport \
    libutils

+# Needed to use gMock 1.7.0 on Android
+LOCAL_CFLAGS += \
+  -DGTEST_HAS_TR1_TUPLE \
+  -DGTEST_USE_OWN_TR1_TUPLE \
+
 include $(BUILD_EXECUTABLE)