From 249a614ab71fa0da81aaaaefebf0a47c7003d5e6 Mon Sep 17 00:00:00 2001
From: Ken Wakasa <kwakasa@google.com>
Date: Tue, 20 Nov 2012 10:24:32 +0900
Subject: [PATCH] Tentatively suppress -Winline for gcc 4.7

bug: 7584718
Change-Id: Ifcb7b6dbb5f0025fa3c44ef6023a95bd91452bc8
---
 native/jni/Android.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/native/jni/Android.mk b/native/jni/Android.mk
index 51aa4eabe..e87577e06 100644
--- a/native/jni/Android.mk
+++ b/native/jni/Android.mk
@@ -32,8 +32,10 @@ LOCAL_CFLAGS += -Werror -Wall -Wextra -Weffc++ -Wformat=2 -Wcast-qual -Wcast-ali
     -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