Enable cfi for libhevc

Bug: 158010610
Bug: 173497308
Test: Ran atest with DecoderConformanceTest, ImageReaderDecoderTest,
VideoDecoderPerfTest, VideoEncoderTest. Compare the
before and after enabling CFI results since there was a number of tests
that were initially failing.

Change-Id: I4d5ff6818b50755b233b0e3530f46b3680da9bb7

1 files changed, 29 insertions, 4 deletions

diff --git a/Android.bp b/Android.bp
index c60d9e1..cc07f1e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -368,11 +368,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: "libhevc_blocklist.txt",
     },
 
@@ -749,11 +761,24 @@ 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: "libhevc_blocklist.txt",
     },