commit 5690f9c39f35ef9c910f9b2dd0ddfc9beabe2f4b
author Cindy Zhou <zhouci@google.com> Fri Jan 08 17:47:26 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 08 17:47:26 2021 +0000
tree a61a24a581ced17612f21faa11d4993755aa6d65
parent 5d8224586cdab3e96647a2fa7243ec5110b2146a
parent c93fff6784ee70b8c78b7d29c1bc2f3893a56e78

Merge "Enable cfi for aac"

Android.bp

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