From fbfcfe6853642c2ce6f1e756747f33f1682725cf Mon Sep 17 00:00:00 2001
From: Steve Block <steveblock@google.com>
Date: Mon, 1 Nov 2010 16:15:34 +0000
Subject: Disable -Wsign-promo when building WebKit to avoid excessive warnings
 from Chromium headers

If the root of the problem is fixed upstream, this warning can be
re-enabled.

Bug: 3143773
Change-Id: Ic419e353e3d0536d3a3c86f9e8e4615d30d9fb25
---
 Android.mk | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'Android.mk')

diff --git a/Android.mk b/Android.mk
index 563c2cb..7858643 100644
--- a/Android.mk
+++ b/Android.mk
@@ -293,6 +293,7 @@ ifeq ($(HTTP_STACK),chrome)
 LOCAL_CFLAGS += -DGOOGLEURL
 LOCAL_CFLAGS += -DWTF_USE_CHROME_NETWORK_STACK
 endif # HTTP_STACK == chrome
+LOCAL_CPPFLAGS := -Wno-sign-promo
 
 # Adds GL and EGL extensions for the GL backend
 LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES
@@ -396,6 +397,7 @@ LOCAL_SRC_FILES := $(WEBKIT_SRC_FILES)
 # Define this for use in other makefiles.
 WEBKIT_C_INCLUDES := $(LOCAL_C_INCLUDES)
 WEBKIT_CFLAGS := $(LOCAL_CFLAGS)
+WEBKIT_CPPFLAGS := $(LOCAL_CPPFLAGS)
 WEBKIT_GENERATED_SOURCES := $(LOCAL_GENERATED_SOURCES)
 WEBKIT_LDLIBS := $(LOCAL_LDLIBS)
 WEBKIT_SHARED_LIBRARIES := $(LOCAL_SHARED_LIBRARIES)
@@ -446,6 +448,7 @@ LOCAL_STATIC_LIBRARIES += libjs
 endif
 LOCAL_LDFLAGS := -fvisibility=hidden
 LOCAL_CFLAGS := $(WEBKIT_CFLAGS)
+LOCAL_CPPFLAGS := $(WEBKIT_CPPFLAGS)
 LOCAL_C_INCLUDES := $(WEBKIT_C_INCLUDES)
 LOCAL_PATH := $(BASE_PATH)
 LOCAL_SRC_FILES := \
-- 
cgit v1.1