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

Commit 2422db37 authored by Dennis Shen's avatar Dennis Shen Committed by Android (Google) Code Review
Browse files

Merge "switch over to use new storage read api instead of... 

Merge "switch over to use new storage read api instead of server_configurable_flags, this new read api lib will be needed for new codegened aconfig flag lib." into main
parents 32c77383 e2399c21

media/codec2/hal/common/Android.bp

+3 −5
Original line number Diff line number Diff line
@@ -28,13 +28,9 @@ cc_library { 
        "liblog",

        "libstagefright_foundation",

        "server_configurable_flags",

        "libaconfig_storage_read_api_cc",

    ],



    static_libs: ["aconfig_mediacodec_flags_c_lib"],



    defaults: [

        "aconfig_lib_cc_static_link.defaults",

    ],

}



cc_library_static {
@@ -57,6 +53,7 @@ cc_library_static { 
    shared_libs: [

        "libbase",

        "server_configurable_flags",

        "libaconfig_storage_read_api_cc",

    ],



    static_libs: ["aconfig_mediacodec_flags_c_lib"],
@@ -71,5 +68,6 @@ cc_defaults { 
    shared_libs: [

        "libbase",

        "server_configurable_flags",

        "libaconfig_storage_read_api_cc",

    ],

}

media/codec2/sfplugin/Android.bp

+1 −4
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ cc_library_shared { 
        "libui",

        "libutils",

        "server_configurable_flags",

        "libaconfig_storage_read_api_cc",

    ],



    export_shared_lib_headers: [
@@ -91,10 +92,6 @@ cc_library_shared { 
        "libcodec2_client",

    ],



    defaults: [

        "aconfig_lib_cc_static_link.defaults",

    ],



    sanitize: {

        cfi: true,

        misc_undefined: [

media/libstagefright/Android.bp

+1 −4
Original line number Diff line number Diff line
@@ -315,13 +315,10 @@ cc_library { 
        "libaudioclient_aidl_conversion",

        "packagemanager_aidl-cpp",

        "server_configurable_flags",

        "libaconfig_storage_read_api_cc",

        "aconfig_mediacodec_flags_c_lib",

    ],



    defaults: [

        "aconfig_lib_cc_static_link.defaults",

    ],



    static_libs: [

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

        "libstagefright_esds",