Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 68ffb439 authored by Cindy Zhou's avatar Cindy Zhou
Browse files

Enable cfi in hevc library 

Bug: 158010610
Bug: 173497308
Test: ran atest 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: I181015a7df8efcce7a79be50d597bf94836ea8c9
parent f6c0c3c5

media/codec2/components/hevc/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -3,12 +3,12 @@ cc_library { 
    defaults: [

        "libcodec2_soft-defaults",

        "libcodec2_soft_sanitize_signed-defaults",

        "libcodec2_soft_sanitize_cfi-defaults",

    ],



    srcs: ["C2SoftHevcDec.cpp"],



    static_libs: ["libhevcdec"],



}



cc_library {
@@ -16,10 +16,10 @@ cc_library { 
    defaults: [

        "libcodec2_soft-defaults",

        "libcodec2_soft_sanitize_signed-defaults",

        "libcodec2_soft_sanitize_cfi-defaults",

    ],



    srcs: ["C2SoftHevcEnc.cpp"],



    static_libs: ["libhevcenc"],



}

media/libstagefright/codecs/hevcdec/Android.bp

+7 −0
Original line number Diff line number Diff line
@@ -17,6 +17,13 @@ cc_library_shared { 
            "signed-integer-overflow",

        ],

        cfi: true,

        diag: {

            cfi: true,

        },

        config: {

            cfi_assembly_support: true,

        },



    },



    // We need this because the current asm generates the following link error: