commit 5e72d9ce5102eed0fbb5b9d7303fb2ec2a2a5276
author Cindy Zhou <zhouci@google.com> Thu Jan 14 13:08:27 2021 -0800
committer Cindy Zhou <zhouci@google.com> Wed Jan 20 22:10:33 2021 +0000
tree bfd7172c7070195fe28bae6276a4c97224f66aef
parent a0969954f631a50530364486c66525ce5ec1beaa

Enable cfi in hevc library

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: I763f717590704d860babd27336a077c76fb5d743

media/codec2/components/hevc/Android.bp

diff --git a/media/codec2/components/hevc/Android.bp b/media/codec2/components/hevc/Android.bp
index 2858212..1be0cfc 100644
--- a/media/codec2/components/hevc/Android.bp
+++ b/media/codec2/components/hevc/Android.bp
@@ -3,6 +3,7 @@
     defaults: [
         "libcodec2_soft-defaults",
         "libcodec2_soft_sanitize_signed-defaults",
+        "libcodec2_soft_sanitize_cfi-defaults",
     ],
 
     srcs: ["C2SoftHevcDec.cpp"],
@@ -16,6 +17,7 @@
     defaults: [
         "libcodec2_soft-defaults",
         "libcodec2_soft_sanitize_signed-defaults",
+        "libcodec2_soft_sanitize_cfi-defaults",
     ],
 
     srcs: ["C2SoftHevcEnc.cpp"],

media/libstagefright/codecs/hevcdec/Android.bp

diff --git a/media/libstagefright/codecs/hevcdec/Android.bp b/media/libstagefright/codecs/hevcdec/Android.bp
index ec436ce..ffad18c 100644
--- a/media/libstagefright/codecs/hevcdec/Android.bp
+++ b/media/libstagefright/codecs/hevcdec/Android.bp
@@ -17,6 +17,9 @@
             "signed-integer-overflow",
         ],
         cfi: true,
+        config: {
+            cfi_assembly_support: true,
+        },
     },
 
     // We need this because the current asm generates the following link error: