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

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

Merge "Enable cfi avc libraries" am: 3171fc6c 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib4c561ee0564fc58b93426a7a22ec7b9d4c0fe33
parents 3478dc80 3171fc6c

media/codec2/components/avc/Android.bp

+4 −2
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",

    ],



    static_libs: ["libavcdec"],
@@ -20,6 +21,7 @@ cc_library { 
    defaults: [

        "libcodec2_soft-defaults",

        "libcodec2_soft_sanitize_signed-defaults",

        "libcodec2_soft_sanitize_cfi-defaults",

    ],



    static_libs: ["libavcenc"],

media/libstagefright/codecs/avcdec/Android.bp

+6 −0
Original line number Diff line number Diff line
@@ -16,6 +16,12 @@ cc_library_shared { 
            "signed-integer-overflow",

        ],

        cfi: true,

        diag: {

            cfi: true,

        },

        config: {

            cfi_assembly_support: true,

        },

    },



    ldflags: ["-Wl,-Bsymbolic"],

media/libstagefright/codecs/avcenc/Android.bp

+6 −0
Original line number Diff line number Diff line
@@ -10,6 +10,12 @@ cc_library_shared { 
            "signed-integer-overflow",

        ],

        cfi: true,

        diag: {

            cfi: true,

        },

        config: {

            cfi_assembly_support: true,

        },

    },



    cflags: [