Merge branch 'mstorjo/master' into dabplusHEADv0.1.6-dabdabplus

1 files changed, 3 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index 75fe8af..13f87c8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,5 +1,6 @@
 cc_library_static {
     name: "libFraunhoferAAC",
+    vendor_available: true,
     srcs: [
         "libAACdec/src/*.cpp",
         "libAACenc/src/*.cpp",
@@ -12,6 +13,8 @@ cc_library_static {
         "libSBRenc/src/*.cpp",
     ],
     cflags: [
+        "-Werror",
+        "-Wno-constant-conversion",
         "-Wno-sequence-point",
         "-Wno-extra",
         "-Wno-#warnings",