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

Commit 1b796140 authored by Ted Bauer's avatar Ted Bauer Committed by Gerrit Code Review
Browse files

Merge "Add deps for new aconfig flagging storage" into main

parents 7d720a0e b79ebce3

media/codec2/hal/aidl/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ cc_library { 
    name: "libcodec2_aidl_client",



    defaults: [

        "aconfig_lib_cc_static_link.defaults",

        "libcodec2_hal_selection",

    ],
@@ -65,6 +66,7 @@ cc_library { 
    ],



    defaults: [

        "aconfig_lib_cc_static_link.defaults",

        "libcodec2_hal_selection",

    ],

media/codec2/hal/common/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -31,6 +31,10 @@ cc_library { 
    ],



    static_libs: ["aconfig_mediacodec_flags_c_lib"],



    defaults: [

        "aconfig_lib_cc_static_link.defaults",

    ],

}



cc_library_static {

media/codec2/sfplugin/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -91,6 +91,10 @@ cc_library_shared { 
        "libcodec2_client",

    ],



    defaults: [

        "aconfig_lib_cc_static_link.defaults",

    ],



    sanitize: {

        cfi: true,

        misc_undefined: [

media/codec2/vndk/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ cc_library { 
    ],



    defaults: [

	"aconfig_lib_cc_static_link.defaults",

        "libcodec2_hal_selection",

    ],

media/libstagefright/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -318,6 +318,10 @@ cc_library { 
        "aconfig_mediacodec_flags_c_lib",

    ],



    defaults: [

        "aconfig_lib_cc_static_link.defaults",

    ],



    static_libs: [

        "android.media.codec-aconfig-cc",

        "libstagefright_esds",