aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChih-hung Hsieh <chh@google.com>2017-11-08 05:21:01 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-11-08 05:21:01 +0000
commit1df89fb55235fa35c1ef546e79bb253e65aae67a (patch)
tree30c19a16c187f5767c934eaa241c8f5a63826ec9
parentce252a75e4a3e03f0bf947bf74a1a79ae1b1cfa1 (diff)
parent9187cb4ce2edfb9454f6f9d0f2de09b7e390ab10 (diff)
downloadvalgrind-1df89fb55235fa35c1ef546e79bb253e65aae67a.tar.gz
Merge "Use -Werror in external/valgrind"
am: 9187cb4ce2 Change-Id: I44538d4de2e62c913b6ad041208c29081dedb082
-rw-r--r--Android.mk26
1 files changed, 21 insertions, 5 deletions
diff --git a/Android.mk b/Android.mk
index ea29261d1..8c3f8a226 100644
--- a/Android.mk
+++ b/Android.mk
@@ -25,12 +25,29 @@ ifneq ($(filter x86_64, $(TARGET_ARCH)),)
endif
common_cflags := \
- -Wall -Wmissing-prototypes -Wshadow -Wpointer-arith -Wmissing-declarations \
- -Wno-pointer-sign -Wno-sign-compare -Wno-unused-parameter -Wno-shadow \
- -fno-strict-aliasing -fno-stack-protector -Wno-tautological-compare -Wno-self-assign \
+ -fno-strict-aliasing \
+ -fno-stack-protector \
-DVGO_linux=1 \
-DANDROID_SYMBOLS_DIR=\"/data/local/symbols\" \
- -std=gnu99
+ -Wall \
+ -Werror \
+ -Wmissing-declarations \
+ -Wmissing-prototypes \
+ -Wpointer-arith \
+ -Wno-asm-operand-widths \
+ -Wno-cast-align \
+ -Wno-format \
+ -Wno-incompatible-library-redeclaration \
+ -Wno-incompatible-pointer-types \
+ -Wno-initializer-overrides \
+ -Wno-missing-field-initializers \
+ -Wno-pointer-sign \
+ -Wno-self-assign \
+ -Wno-shadow \
+ -Wno-sign-compare \
+ -Wno-tautological-compare \
+ -Wno-unused-parameter \
+ -std=gnu99
ifeq ($(TARGET_IS_64_BIT),true)
vg_target_module_path := /system/lib64/valgrind
@@ -97,7 +114,6 @@ vg_local_module=libvex
vg_local_cflags := $(common_cflags) \
-Wbad-function-cast \
-Wcast-qual \
- -Wcast-align \
-fstrict-aliasing \
vg_local_src_files := \