summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPirama Arumuga Nainar <pirama@google.com>2016-07-19 23:41:20 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-07-19 23:41:20 +0000
commit4643acaa34f2d7bddaf86c9dbe21bce0fc5aec21 (patch)
tree55bfbfe3d04f0d581cff73ad669685efb30bdf43
parentd5a72fae4ac66ab99d973af6cdd459dcde382573 (diff)
parentbba87840d3a529ff20cca0d3b1ba60ae20af9ab3 (diff)
Merge \"Disable warning triggered in Clang r271374\"
am: bba87840d3 Change-Id: I03686c2e9c341d927b295c150aea8eea37f69338
-rw-r--r--media/mca/filterpacks/Android.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/media/mca/filterpacks/Android.mk b/media/mca/filterpacks/Android.mk
index 0ff76581c466..d89b1e976389 100644
--- a/media/mca/filterpacks/Android.mk
+++ b/media/mca/filterpacks/Android.mk
@@ -50,4 +50,8 @@ LOCAL_SHARED_LIBRARIES := liblog libutils libfilterfw
LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code
+# Bug: http://b/29823425 Disable constant-conversion warning triggered in
+# native/imageproc/to_rgba.c
+LOCAL_CFLAGS += -Wno-constant-conversion
+
include $(BUILD_SHARED_LIBRARY)