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

Commit c41bcf00 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 13647266 from f1ba7e49 to 25Q4-release 

Change-Id: Idc0ce6d6c740ec7822b0f51027d95029a4c16d41
parents fc315d52 f1ba7e49

libs/gui/Android.bp

+13 −0
Original line number Diff line number Diff line
@@ -41,6 +41,19 @@ cc_aconfig_library { 
    aconfig_declarations: "libgui_flags",

}



cc_aconfig_library {

    name: "aconfig_libgui_flags_c_lib",

    min_sdk_version: "30",

    vendor_available: true,

    double_loadable: true,

    host_supported: true,

    apex_available: [

        "//apex_available:platform",

        "com.android.media.swcodec",

    ],

    aconfig_declarations: "libgui_flags",

}



cc_aconfig_library {

    name: "libguiflags_no_apex",

    aconfig_declarations: "libgui_flags",

libs/gui/Flags.cpp

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ sp<SurfaceType> mediaSurfaceToCameraSurfaceType(const sp<MediaSurfaceType>& mst, 
#if WB_LIBCAMERASERVICE_WITH_DEPENDENCIES

    return mst;

#else

    return mst->getGraphicBufferProducer();

    return mst->getIGraphicBufferProducer();

#endif

#else

#if WB_LIBCAMERASERVICE_WITH_DEPENDENCIES