3 files changed, 6 insertions, 1 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",
diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..ffd753e
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,2 @@
+jmtrivi@google.com
+gkasten@android.com
diff --git a/libAACenc/src/adj_thr.cpp b/libAACenc/src/adj_thr.cpp
index a79a9ae..09584f4 100644
--- a/libAACenc/src/adj_thr.cpp
+++ b/libAACenc/src/adj_thr.cpp
@@ -958,7 +958,7 @@ static FIXP_DBL FDKaacEnc_calcChaosMeasure(PSY_OUT_CHANNEL *psyOutChannel,
            CalcInvLdData( (((CalcLdData(frameFormFactor)>>1) -
                             (CalcLdData(frameEnergy)>>(2+1))) -
                            (fMultDiv2(FL2FXCONST_DBL(0.75f),CalcLdData((FIXP_DBL)frameNLines<<(DFRACT_BITS-1-SCALE_NLINES))) -
-                            (((FIXP_DBL)(SCALE_FORM_FAC-SCALE_NRGS_SQRT4+FORM_FAC_SHIFT-(SCALE_NLINES_P34))<<(DFRACT_BITS-1-LD_DATA_SHIFT))>>1))
+                            (((FIXP_DBL)(-((-SCALE_FORM_FAC+SCALE_NRGS_SQRT4-FORM_FAC_SHIFT+SCALE_NLINES_P34) << (DFRACT_BITS-1-LD_DATA_SHIFT))))>>1))
                           )<<1 );
   } else {