Merge "Enable cfi for aac" am: 5690f9c39f am: 738df3d018 am: 524e89257c

Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1518238

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifa9c52a5ca9ddc6ca5edc35166afdc4a1f5b5788

1 files 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: [