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

Commit f1ba7e49 authored by Carlos Martinez Romero's avatar Carlos Martinez Romero Committed by Android (Google) Code Review
Browse files

Merge "Replace IGBP references for Surface in MediaRecorder (part 2)." into main

parents 486c94ee 26a1d60c

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