commit efa3c87d9a19d76da59f196afe636be07db9da20
author Cindy Zhou <zhouci@google.com> Fri Jan 08 22:29:44 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jan 08 22:29:44 2021 +0000
tree aca8bcd1b962a123e1020595a63f800cdb5bf7c8
parent a773e248dd3d940128cde796bac5a89d99608cab
parent 9725538e80a60520706b5dbfe91412f2908a3109

Merge "Enable cfi xaac libraries" am: d46a259d34 am: 9725538e80

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1532116

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia4f272195c1f6df1a9d5671a9b365e6ba192ca2d

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"],