commit 92042fe910cd03e3d6c7ef8f7a53a01c545975be
author James Hawkins <jhawkins@google.com> Tue Feb 23 17:53:16 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 23 17:53:16 2016 +0000
tree d789d90caba5026beb00f2114d133578ae4ac97f
parent 88c2bb4c2d46745d1dbe6fa2f5c69f816a78184e
parent 0543f9f08eb43d8aaa0645d21d7798f4e9b90fa1

Merge "external/gmock: Silence warnings by using the correct LOCAL_CFLAGS."

src/Android.mk

diff --git a/src/Android.mk b/src/Android.mk
index 5469970..85e6995 100644
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -55,7 +55,7 @@
 LOCAL_C_INCLUDES := $(libgmock_target_includes)
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/../include
 LOCAL_CPPFLAGS := -std=c++11
-LOCAL_C_FLAGS += $(libgmock_cflags)
+LOCAL_CFLAGS += $(libgmock_cflags)
 LOCAL_MODULE := libgmock_ndk
 
 include $(BUILD_STATIC_LIBRARY)
@@ -74,7 +74,7 @@
 LOCAL_C_INCLUDES := $(libgmock_target_includes)
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/../include
 LOCAL_CPPFLAGS := -std=c++11
-LOCAL_C_FLAGS += $(libgmock_cflags)
+LOCAL_CFLAGS += $(libgmock_cflags)
 LOCAL_MODULE := libgmock_main_ndk
 
 include $(BUILD_STATIC_LIBRARY)
@@ -89,7 +89,7 @@
 LOCAL_CPP_EXTENSION := .cc
 LOCAL_SRC_FILES := gmock-all.cc
 LOCAL_C_INCLUDES := $(libgmock_host_includes)
-LOCAL_C_FLAGS += $(libgmock_cflags)
+LOCAL_CFLAGS += $(libgmock_cflags)
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/../include
 LOCAL_MODULE := libgmock_host
 LOCAL_MULTILIB := both
@@ -108,7 +108,7 @@
 LOCAL_SRC_FILES := gmock_main.cc
 LOCAL_C_INCLUDES := $(libgmock_host_includes)
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/../include
-LOCAL_C_FLAGS += $(libgmock_cflags)
+LOCAL_CFLAGS += $(libgmock_cflags)
 LOCAL_MODULE := libgmock_main_host
 LOCAL_MULTILIB := both
 LOCAL_SANITIZE := never