Merge Android Pie into master

Bug: 112104996
Change-Id: I110b508de124016501bc62120163c58633857438

1 files changed, 14 insertions, 4 deletions

diff --git a/Android.bp b/Android.bp
index 13f87c8..50cc092 100644
--- a/Android.bp
+++ b/Android.bp
@@ -11,16 +11,22 @@ cc_library_static {
         "libMpegTPEnc/src/*.cpp",
         "libSBRdec/src/*.cpp",
         "libSBRenc/src/*.cpp",
+        "libArithCoding/src/*.cpp",
+        "libDRCdec/src/*.cpp",
+        "libSACdec/src/*.cpp",
+        "libSACenc/src/*.cpp",
     ],
     cflags: [
         "-Werror",
-        "-Wno-constant-conversion",
-        "-Wno-sequence-point",
-        "-Wno-extra",
+        "-Wno-unused-parameter",
         "-Wno-#warnings",
-        "-Wno-constant-logical-operand",
+        "-Wuninitialized",
         "-Wno-self-assign",
     ],
+    sanitize: {
+        misc_undefined:["unsigned-integer-overflow", "signed-integer-overflow"],
+        cfi: true,
+    },
     export_include_dirs: [
         "libAACdec/include",
         "libAACenc/include",
@@ -31,5 +37,9 @@ cc_library_static {
         "libMpegTPEnc/include",
         "libSBRdec/include",
         "libSBRenc/include",
+        "libArithCoding/include",
+        "libDRCdec/include",
+        "libSACdec/include",
+        "libSACenc/include",
     ],
 }