Merge "Enable cfi for aac"

2021-01-08 17:47:26 +00:00 · 2021-01-08 17:47:26 +00:00 · 5690f9c39f
parent 5d8224586c c93fff6784
commit 5690f9c39f
1 changed files with 8 additions and 2 deletions
--- 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: [