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

Commit 06541006 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Disable building software OMX codecs" into main am: 7a299118 

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



Change-Id: Iacb4b3df4a1112baf9751a309b40de16825fad90
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4536eaa7 7a299118

media/libstagefright/omx/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -184,6 +184,9 @@ cc_library_shared { 


cc_defaults {

    name: "libstagefright_softomx-defaults",

    // TODO (b/316432618) Software OMX codecs are no longer used, disable building them till

    // this code is removed completely.

    enabled: false,

    vendor_available: true,



    cflags: [

services/mediacodec/Android.bp

+0 −25
Original line number Diff line number Diff line
@@ -95,31 +95,6 @@ cc_binary { 
        "android.hidl.memory@1.0",

    ],



    runtime_libs: [

        "libstagefright_soft_aacdec",

        "libstagefright_soft_aacenc",

        "libstagefright_soft_amrdec",

        "libstagefright_soft_amrnbenc",

        "libstagefright_soft_amrwbenc",

        "libstagefright_soft_avcdec",

        "libstagefright_soft_avcenc",

        "libstagefright_soft_flacdec",

        "libstagefright_soft_flacenc",

        "libstagefright_soft_g711dec",

        "libstagefright_soft_gsmdec",

        "libstagefright_soft_hevcdec",

        "libstagefright_soft_mp3dec",

        "libstagefright_soft_mpeg2dec",

        "libstagefright_soft_mpeg4dec",

        "libstagefright_soft_mpeg4enc",

        "libstagefright_soft_opusdec",

        "libstagefright_soft_rawdec",

        "libstagefright_soft_vorbisdec",

        "libstagefright_soft_vpxdec",

        "libstagefright_soft_vpxenc",

        "libstagefright_softomx_plugin",

    ],



    // OMX interfaces force this to stay in 32-bit mode;

    compile_multilib: "32",