commit 249a614ab71fa0da81aaaaefebf0a47c7003d5e6
author Ken Wakasa <kwakasa@google.com> Tue Nov 20 10:24:32 2012 +0900
committer Ken Wakasa <kwakasa@google.com> Tue Nov 20 10:27:36 2012 +0900
tree ac2cbfc674cfb544fc9a1ff084ae46b3a340e90d
parent 120b64f61774d476083b57ecaea567952358280d

Tentatively suppress -Winline for gcc 4.7

bug: 7584718
Change-Id: Ifcb7b6dbb5f0025fa3c44ef6023a95bd91452bc8

native/jni/Android.mk

diff --git a/native/jni/Android.mk b/native/jni/Android.mk
index 51aa4ea..e87577e 100644
--- a/native/jni/Android.mk
+++ b/native/jni/Android.mk
@@ -32,8 +32,10 @@
     -Wwrite-strings -Wfloat-equal -Wpointer-arith -Winit-self -Wredundant-decls -Wno-system-headers
 
 ifeq ($(TARGET_ARCH), arm)
+ifneq ($(TARGET_GCC_VERSION), 4.7)
 LOCAL_CFLAGS += -Winline
-endif
+endif # TARGET_GCC_VERSION
+endif # TARGET_ARCH
 
 # To suppress compiler warnings for unused variables/functions used for debug features etc.
 LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function