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

Change-Id: I3cee76ab540b54b4ef6d6bdb891fc53fd0ec562d
diff --git a/Android.bp b/Android.bp
index 75fe8af..0ae0b84 100644
--- a/Android.bp
+++ b/Android.bp
@@ -12,6 +12,8 @@
         "libSBRenc/src/*.cpp",
     ],
     cflags: [
+        "-Werror",
+        "-Wno-constant-conversion",
         "-Wno-sequence-point",
         "-Wno-extra",
         "-Wno-#warnings",