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

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

Merge "Revert "Enable cfi in hevc library"" am: cd13efa9 am: 26bb5daf 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I161d41ab2ff46b153c12805480a5dd3a5ec267ea
parents b6478dda 26bb5daf

media/codec2/components/hevc/Android.bp

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

    defaults: [

        "libcodec2_soft-defaults",

        "libcodec2_soft-defaults",

        "libcodec2_soft_sanitize_signed-defaults",

        "libcodec2_soft_sanitize_signed-defaults",

        "libcodec2_soft_sanitize_cfi-defaults",

    ],

    ],





    srcs: ["C2SoftHevcDec.cpp"],

    srcs: ["C2SoftHevcDec.cpp"],





    static_libs: ["libhevcdec"],

    static_libs: ["libhevcdec"],



}

}





cc_library {

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

    defaults: [

        "libcodec2_soft-defaults",

        "libcodec2_soft-defaults",

        "libcodec2_soft_sanitize_signed-defaults",

        "libcodec2_soft_sanitize_signed-defaults",

        "libcodec2_soft_sanitize_cfi-defaults",

    ],

    ],





    srcs: ["C2SoftHevcEnc.cpp"],

    srcs: ["C2SoftHevcEnc.cpp"],





    static_libs: ["libhevcenc"],

    static_libs: ["libhevcenc"],



}
 
}

media/libstagefright/codecs/hevcdec/Android.bp

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

            "signed-integer-overflow",

        ],

        ],

        cfi: true,

        cfi: true,

        diag: {

            cfi: true,

        },

        config: {

            cfi_assembly_support: true,

        },



    },

    },





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

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