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

Commit 049db601 authored by Cindy Zhou's avatar Cindy Zhou
Browse files

Annotating createSoftOMXComponent with cfi attribute 

Add annotation for CFI support for createSoftOMXComponent after enabling cfi in codec lib to avoid crashes.

Bug: 177185188
Bug: 177098919
Bug: 177227953
Test: forrest run https://android-build.googleplex.com/builds/forrest/run/L15400000787851053
Change-Id: Icc959806eda73e26158fc0f06815ea34ac1d9d1c
parent d46a259d

media/libstagefright/codecs/aacdec/SoftAAC2.cpp

+1 −0
Original line number Diff line number Diff line
@@ -1247,6 +1247,7 @@ void SoftAAC2::onPortEnableCompleted(OMX_U32 portIndex, bool enabled) { 


}  // namespace android



__attribute__((cfi_canonical_jump_table))

android::SoftOMXComponent *createSoftOMXComponent(

        const char *name, const OMX_CALLBACKTYPE *callbacks,

        OMX_PTR appData, OMX_COMPONENTTYPE **component) {

media/libstagefright/codecs/aacenc/SoftAACEncoder2.cpp

+1 −0
Original line number Diff line number Diff line
@@ -732,6 +732,7 @@ void SoftAACEncoder2::onReset() { 


}  // namespace android



__attribute__((cfi_canonical_jump_table))

android::SoftOMXComponent *createSoftOMXComponent(

        const char *name, const OMX_CALLBACKTYPE *callbacks,

        OMX_PTR appData, OMX_COMPONENTTYPE **component) {

media/libstagefright/codecs/amrnb/dec/SoftAMR.cpp

+1 −0
Original line number Diff line number Diff line
@@ -576,6 +576,7 @@ void SoftAMR::onReset() { 


}  // namespace android



__attribute__((cfi_canonical_jump_table))

android::SoftOMXComponent *createSoftOMXComponent(

        const char *name, const OMX_CALLBACKTYPE *callbacks,

        OMX_PTR appData, OMX_COMPONENTTYPE **component) {

media/libstagefright/codecs/amrnb/enc/SoftAMRNBEncoder.cpp

+1 −0
Original line number Diff line number Diff line
@@ -421,6 +421,7 @@ void SoftAMRNBEncoder::onQueueFilled(OMX_U32 /* portIndex */) { 


}  // namespace android



__attribute__((cfi_canonical_jump_table))

android::SoftOMXComponent *createSoftOMXComponent(

        const char *name, const OMX_CALLBACKTYPE *callbacks,

        OMX_PTR appData, OMX_COMPONENTTYPE **component) {

media/libstagefright/codecs/amrwbenc/SoftAMRWBEncoder.cpp

+1 −0
Original line number Diff line number Diff line
@@ -476,6 +476,7 @@ void SoftAMRWBEncoder::onQueueFilled(OMX_U32 /* portIndex */) { 


}  // namespace android



__attribute__((cfi_canonical_jump_table))

android::SoftOMXComponent *createSoftOMXComponent(

        const char *name, const OMX_CALLBACKTYPE *callbacks,

        OMX_PTR appData, OMX_COMPONENTTYPE **component) {