Merge "Use -Werror in external/aac" am: f38aee2252 am: 82440fab16
am: 5a1868a64f

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