[automerger skipped] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info skipped: 8b0edf42a0 am: fed4ae1115 am: 45ca1d7199
am: 31fac02b0e

Change-Id: Id4466d91efbbbea558c16463fa42c77ff157c519
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",