Merge "Fdlibm: Silence warnings"
diff --git a/Android.mk b/Android.mk
index 990225a..f5b3f54 100644
--- a/Android.mk
+++ b/Android.mk
@@ -57,12 +57,17 @@
# floating point expession contraction (e.g: fused multiply-add operations).
cflags += -std=c99
+# Disable warnings. We need a specific version of fdlibm and can't fix this upstream.
+cflags += -Wno-sign-compare -Wno-dangling-else -Wno-unknown-pragmas
+clang_cflags := -Wno-dangling-else -Wno-logical-op-parentheses -Wno-sometimes-uninitialized
+
#
# Build for the target (device).
#
include $(CLEAR_VARS)
LOCAL_CFLAGS := $(cflags)
+LOCAL_CLANG_CFLAGS := $(clang_cflags)
LOCAL_CLANG := true
LOCAL_MODULE := libfdlibm
LOCAL_SRC_FILES:= $(src_files)
@@ -75,6 +80,7 @@
include $(CLEAR_VARS)
LOCAL_CFLAGS := $(cflags)
+LOCAL_CLANG_CFLAGS := $(clang_cflags)
LOCAL_CLANG := true
LOCAL_MODULE := libfdlibm
LOCAL_MULTILIB := both
