summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAurimas Liutikas <aurimas@google.com>2017-02-17 12:49:24 -0800
committerAurimas Liutikas <aurimas@google.com>2017-02-17 12:50:15 -0800
commit67002561e88ffa25b72e2596cf50f20cceba87f6 (patch)
tree50ab76ba5221621b3e83d66991002feb2563392b
parentb162e864bd02bb79423b4ef01d0e5e5840aa416b (diff)
downloadtinyxml-67002561e88ffa25b72e2596cf50f20cceba87f6.tar.gz
Supress warnings in external/tinyxml
This library usage is getting removed. Suppress the existing warning until the killing is complete. Bug: 30215664 Test: make libtinyxml compiles without warnings Change-Id: I0b1cefcb4a08e8a73147695f99591a99c23d5205
-rw-r--r--Android.mk12
1 files changed, 11 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index 7a91be0..92fdf5b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -11,6 +11,12 @@ commonSources:= \
tinyxmlerror.cpp \
tinystr.cpp
+commonFlags := \
+ -Wno-undefined-bool-conversion \
+ -Wno-missing-braces \
+ -Wno-logical-op-parentheses \
+ -Werror
+
# For the host
# =====================================================
LOCAL_PATH:= $(call my-dir)
@@ -21,7 +27,7 @@ LOCAL_SRC_FILES:= \
LOCAL_MODULE:= libtinyxml
-LOCAL_CFLAGS+= $(TOOL_CFLAGS)
+LOCAL_CFLAGS+= $(TOOL_CFLAGS) $(commonFlags)
LOCAL_LDFLAGS:= $(TOOL_LDFLAGS) -lstdc++ -lc
LOCAL_MULTILIB := both
@@ -38,6 +44,8 @@ LOCAL_SRC_FILES:= \
LOCAL_MODULE:= libtinyxml
+LOCAL_CFLAGS+= $(commonFlags)
+
include $(BUILD_STATIC_LIBRARY)
@@ -50,6 +58,8 @@ LOCAL_SRC_FILES:= \
LOCAL_MODULE:= libtinyxml
+LOCAL_CFLAGS+= $(commonFlags)
+
LOCAL_SHARED_LIBRARIES := \
libc \
libstdc++