Merge "Enable cfi for libvpx"
diff --git a/Android.bp b/Android.bp
index 1f7333b..6e84e3c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1098,6 +1098,14 @@
         darwin: {
             enabled: false,
         },
+        android: {
+            sanitize: {
+                cfi: true,
+                config: {
+                    cfi_assembly_support: true,
+                },
+            },
+        },
     },
 
     arch: {
@@ -1144,8 +1152,6 @@
     sanitize: {
         integer_overflow: true,
         misc_undefined: ["bounds"],
-        // Enable CFI if this becomes a shared library.
-        // cfi: true,
         blocklist: "libvpx_blocklist.txt",
     },
     min_sdk_version: "29",
diff --git a/libvpx_blocklist.txt b/libvpx_blocklist.txt
index df3e36c..c9ea142 100644
--- a/libvpx_blocklist.txt
+++ b/libvpx_blocklist.txt
@@ -1,6 +1,3 @@
-[cfi]
-src:*external/libvpx/*
-
 [integer]
 # Performance related
 fun:read_bool