summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Stephen Hines <srhines@google.com> 2016-07-19 22:02:31 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2016-07-19 22:02:31 +0000
commitbba87840d3a529ff20cca0d3b1ba60ae20af9ab3 (patch)
tree16e4a24817ffba3f8bc6f9766211272a6b675b2c
parente2994438d24645d5b5b2345db170354e6354ae6e (diff)
parentb6709700dbac0e3f282af5a7f2d3144cd587563e (diff)
Merge "Disable warning triggered in Clang r271374"
-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)