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

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

Merge "Remove diag mode for cfi" am: e392f2cf am: 3489cf2f 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I60e62b3601d42ddab187d8561b9723328558b42b
parents d016af34 3489cf2f

media/codec2/components/base/Android.bp

+0 −3
Original line number Diff line number Diff line
@@ -102,9 +102,6 @@ cc_defaults { 
        config: {

            cfi_assembly_support: true,

        },

        diag: {

            cfi: true,

        },

    },

}

media/libstagefright/codecs/avcdec/Android.bp

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

        ],

        cfi: true,

        diag: {

            cfi: true,

        },

        config: {

            cfi_assembly_support: true,

        },

media/libstagefright/codecs/avcenc/Android.bp

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

        ],

        cfi: true,

        diag: {

            cfi: true,

        },

        config: {

            cfi_assembly_support: true,

        },

media/libstagefright/codecs/xaacdec/Android.bp

+0 −3
Original line number Diff line number Diff line
@@ -14,9 +14,6 @@ cc_library_shared { 
        // integer_overflow: true,

        misc_undefined: [ "signed-integer-overflow", "unsigned-integer-overflow", ],

        cfi: true,

	diag: {

            cfi: true,

        },

        config: {

            cfi_assembly_support: true,

        },