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

Commit 0f950843 authored by Jiwen 'Steve' Cai's avatar Jiwen 'Steve' Cai
Browse files

Move BufferHub-based IGBP into libgui 

Currently the BufferHub based IGBP implementation lives inside
frameworks/libs/vr and libbufferhubqueue is depending on libgui. This CL
reverses the dependency and paves the way of future integration of
BufferHub into libgui.

Mirrors changes to make this work:
1/ Fix shared lib dependency of libpdx
2/ Allow implicit template instantiation in libgui
3/ Mute clang warnings caused by libpdx

Bug: 72051005
Bug: 70046255
Test: libgui-test, buffer_hub_queue_producer-test, dvr_api-test
Change-Id: I7541498f78aaeb4b15fc6cb6439a2e2d706b9e99
parent 2b6e2ef2

libs/gui/Android.bp

+12 −0
Original line number Diff line number Diff line
@@ -62,6 +62,9 @@ cc_library_shared { 
        // Allow documentation warnings

        "-Wno-documentation",



        // Allow implicit instantiation for templated class function

        "-Wno-undefined-func-template",



        "-DDEBUG_ONLY_CODE=0",

    ],
@@ -79,6 +82,7 @@ cc_library_shared { 


    srcs: [

        "BitTube.cpp",

        "BufferHubProducer.cpp",

        "BufferItem.cpp",

        "BufferItemConsumer.cpp",

        "BufferQueue.cpp",
@@ -131,7 +135,15 @@ cc_library_shared { 
        "android.hardware.configstore-utils",

    ],



    // TODO(b/70046255): Remove these once BufferHub is integrated into libgui.

    static_libs: [

        "libbufferhub",

        "libbufferhubqueue",

        "libpdx_default_transport",

    ],



    header_libs: [

        "libdvr_headers",

        "libnativebase_headers",

        "libgui_headers",

    ],

libs/vr/libbufferhub/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -59,6 +59,10 @@ cc_library { 
    export_header_lib_headers: [

        "libnativebase_headers",

    ],

    vendor_available: false,

    vndk: {

        enabled: true,

    },

}



cc_test {

libs/vr/libbufferhub/include/private/dvr/bufferhub_rpc.h

+1 −1
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ 
#define ANDROID_DVR_BUFFERHUB_RPC_H_



#include <cutils/native_handle.h>

#include <gui/BufferQueueDefs.h>

#include <sys/types.h>

#include <ui/BufferQueueDefs.h>



#include <dvr/dvr_api.h>

#include <pdx/channel_handle.h>