From c93fff6784ee70b8c78b7d29c1bc2f3893a56e78 Mon Sep 17 00:00:00 2001
From: Cindy Zhou <zhouci@google.com>
Date: Thu, 3 Dec 2020 13:25:26 -0800
Subject: [PATCH] Enable cfi for aac

Bug: 158010610
Bug: 173497308
Test: ran atest DecoderConformanceTest, ImageReaderDecoderTest,
VideoDecoderPerfTest, VideoEncoderTest.  Compare the
before and after enabling CFI results since there was a number of tests
that were initially failing.

Change-Id: I0d0d2a76512dc909a67f34adacff9ffbf536dbe7
---
 Android.bp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/Android.bp b/Android.bp
index 555223b..f40e05e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -32,8 +32,7 @@ cc_library_static {
             "signed-integer-overflow",
             "bounds",
         ],
-        // Enable CFI if this becomes a shared library.
-        // cfi: true,
+        cfi: true,
     },
     shared_libs: [
         "liblog",
@@ -58,6 +57,13 @@ cc_library_static {
         darwin: {
             enabled: false,
         },
+        android: {
+            sanitize: {
+                diag: {
+                    cfi: true,
+                },
+            },
+        },
     },
 
     apex_available: [