commit c0804db241a785193a02857ab465a9f32abbc2fd
author Cindy Zhou <zhouci@google.com> Thu Dec 17 08:23:01 2020 -0800
committer Cindy Zhou <zhouci@google.com> Wed Jan 06 14:54:43 2021 +0000
tree cb27d10fc774d69fa1273dbdaec25dea615def8f
parent 68ffb4396750cedb763b2ca6aca5ae0e5878a51a

Enable cfi xaac libraries

Bug: 158010610
Bug: 173497308
Test: n/a currently not used in the build
Change-Id: Iadf0e1273cb6662db19938a6df89be8be92fff1d

media/codec2/components/xaac/Android.bp

diff --git a/media/codec2/components/xaac/Android.bp b/media/codec2/components/xaac/Android.bp
index 4889d78..9b7e2de 100644
--- a/media/codec2/components/xaac/Android.bp
+++ b/media/codec2/components/xaac/Android.bp
@@ -3,6 +3,7 @@
     defaults: [
         "libcodec2_soft-defaults",
         "libcodec2_soft_sanitize_all-defaults",
+	"libcodec2_soft_sanitize_cfi-defaults",
     ],
 
     srcs: ["C2SoftXaacDec.cpp"],

media/libstagefright/codecs/xaacdec/Android.bp

diff --git a/media/libstagefright/codecs/xaacdec/Android.bp b/media/libstagefright/codecs/xaacdec/Android.bp
index 5385dbc..2d90910 100644
--- a/media/libstagefright/codecs/xaacdec/Android.bp
+++ b/media/libstagefright/codecs/xaacdec/Android.bp
@@ -14,6 +14,12 @@
         // integer_overflow: true,
         misc_undefined: [ "signed-integer-overflow", "unsigned-integer-overflow", ],
         cfi: true,
+	diag: {
+            cfi: true,
+        },
+        config: {
+            cfi_assembly_support: true,
+        },
     },
 
     static_libs: ["libxaacdec"],