[automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 31447431fe am: fce9663d6f am: 658a02f977 am: 243be669b3 skipped: c2fe4b944b am: c54946e671 am: f1a2354a3a
am: d6b29883ff

Change-Id: I1432c9e013fae8ec830ea44d094d63174dde4785
diff --git a/Android.bp b/Android.bp
index daad82c..13f87c8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -13,6 +13,8 @@
         "libSBRenc/src/*.cpp",
     ],
     cflags: [
+        "-Werror",
+        "-Wno-constant-conversion",
         "-Wno-sequence-point",
         "-Wno-extra",
         "-Wno-#warnings",