commit 79cce43a82abc1bc56c65de07a7df47d54e163a9
author Aurimas Liutikas <aurimas@google.com> Fri Mar 11 00:18:37 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Mar 11 00:18:37 2016 +0000
tree 617a437470825277a2d5ef4d9dd4245e964e036c
parent 13ad88f183dc229720220244ba16213327fed644
parent de5ca756d0fa51ffc8232bcffab0b6c66befae26

Merge "Supress unused-parameter warnings in external/regexp_re2."
am: de5ca756d0

* commit 'de5ca756d0fa51ffc8232bcffab0b6c66befae26':
  Supress unused-parameter warnings in external/regexp_re2.

Android.mk

diff --git a/Android.mk b/Android.mk
index 7ec81b1..7096ad6 100644
--- a/Android.mk
+++ b/Android.mk
@@ -57,7 +57,7 @@
 LOCAL_CPP_EXTENSION := .cc
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/re2
 LOCAL_SRC_FILES := $(regexp_re2_files)
-LOCAL_CFLAGS += -frtti
+LOCAL_CFLAGS += -frtti -Wno-unused-parameter
 LOCAL_NDK_STL_VARIANT := gnustl_static
 LOCAL_SDK_VERSION := 14
 include $(BUILD_STATIC_LIBRARY)