diff options
| author | Steve Block <steveblock@google.com> | 2010-11-01 09:45:35 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-01 09:45:35 -0700 |
| commit | cc519b6e7f277a2aa0aa197bdb7163d662749552 (patch) | |
| tree | a143cbde7940daa97f2b3b431ab43f2ab04b0e89 | |
| parent | f947415b59bf9cc2a85a73ef8b3f3d99c9c65199 (diff) | |
| parent | fbfcfe6853642c2ce6f1e756747f33f1682725cf (diff) | |
| download | external_webkit-cc519b6e7f277a2aa0aa197bdb7163d662749552.zip external_webkit-cc519b6e7f277a2aa0aa197bdb7163d662749552.tar.gz external_webkit-cc519b6e7f277a2aa0aa197bdb7163d662749552.tar.bz2 | |
Merge "Disable -Wsign-promo when building WebKit to avoid excessive warnings from Chromium headers"
| -rw-r--r-- | Android.mk | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -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 := \ |