Enable cfi for libhevc

Keeping in original blocklist.
Bug: 158010610
Bug: 173497308
Test: ran atest DecoderConformanceTest, ImageReaderDecoderTest,
VideoDecoderPerfTest, VideoEncoderTest, CodecDecoderSurfaceTest and VideoEncoderDecoderTest.
Compare the before and after enabling CFI results since there was a number of tests
that were initially failing.

Change-Id: I51f99cefacbeeedb6ccfcb9d826c6016d7e7edd6

1 files changed, 8 insertions, 2 deletions

diff --git a/Android.bp b/Android.bp
index c60d9e1..b32578a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -372,7 +372,10 @@ cc_library_static {
         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",
     },
 
@@ -753,7 +756,10 @@ cc_library_static {
         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",
     },