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

Commit 2cb7dcf6 authored by Cindy Zhou's avatar Cindy Zhou Committed by Automerger Merge Worker
Browse files

Merge "Enable cfi in hevc library" am: 6a56a14e 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1551236

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I80934ee94a080dc529b3dc39efa31ef3175d03df
parents f9e31dbc 6a56a14e

media/codec2/components/hevc/Android.bp

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

        "libcodec2_soft-defaults",

        "libcodec2_soft_sanitize_signed-defaults",

        "libcodec2_soft_sanitize_cfi-defaults",

    ],



    srcs: ["C2SoftHevcDec.cpp"],
@@ -16,6 +17,7 @@ cc_library { 
    defaults: [

        "libcodec2_soft-defaults",

        "libcodec2_soft_sanitize_signed-defaults",

        "libcodec2_soft_sanitize_cfi-defaults",

    ],



    srcs: ["C2SoftHevcEnc.cpp"],

media/libstagefright/codecs/hevcdec/Android.bp

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

        ],

        cfi: true,

        config: {

            cfi_assembly_support: true,

        },

    },



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