diff --git a/Android.bp b/Android.bp
index 5ba9c7a..59b45ea 100644
--- a/Android.bp
+++ b/Android.bp
@@ -225,11 +225,23 @@ cc_library_static {
         },
     },
 
+    target: {
+        android: {
+            sanitize: {
+                diag: {
+                    cfi: true,
+                },
+            },
+        },
+    },
+
     sanitize: {
         integer_overflow: true,
         misc_undefined: ["bounds"],
-        // Enable CFI if this becomes a shared library.
-        // cfi: true,
+        cfi: true,
+        config: {
+            cfi_assembly_support: true,
+        },
         blocklist: "libavc_blocklist.txt",
     },
     apex_available: [
@@ -486,11 +498,23 @@ cc_library_static {
         },
     },
 
+    target: {
+        android: {
+            sanitize: {
+                diag: {
+                    cfi: true,
+                },
+            },
+        },
+    },
+
     sanitize: {
         integer_overflow: true,
         misc_undefined: ["bounds"],
-        // Enable CFI if this becomes a shared library.
-        // cfi: true,
+        cfi: true,
+        config: {
+            cfi_assembly_support: true,
+        },
         blocklist: "libavc_blocklist.txt",
     },
     apex_available: [
diff --git a/libavc_blocklist.txt b/libavc_blocklist.txt
index 5bb3630..30a2cef 100644
--- a/libavc_blocklist.txt
+++ b/libavc_blocklist.txt
@@ -1,5 +1,4 @@
 [cfi]
-src:*external/libavc/*
 
 [integer]
 # decoder/ih264d_dpb_mgr.c:1174: 2 - 3 cannot be represented in type 'unsigned int'