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

Commit f5f36c75 authored by Jiwen 'Steve' Cai's avatar Jiwen 'Steve' Cai
Browse files

Remove libpdx*, libbufferhub* from VNDK 

This is largely inspired by ag/3865679: dependencies from libui and
libgui to libpdx_default_transport and libbufferhubque are cut when
building libui and libgui for vendors. This is primarily to exclude
libpdx* and libbufferhubqueue from VNDK.

Bug: 79151096
Test: Build system and inspect bufferhub/pdx related libraries are no
longer in vendor partition.

Change-Id: Idcd524db2a9f6ec96262bcf590fc0f80a0bd26e7
Merged-In: Id4768162aeb72b71d63d7e4498980f276ef58e6b
parent a296b0c2

libs/gui/Android.bp

+16 −0
Original line number Diff line number Diff line
@@ -142,10 +142,26 @@ cc_library_shared { 
        "android.hardware.configstore-utils",

    ],



    // bufferhub is not used when building libgui for vendors

    target: {

        vendor: {

            cflags: ["-DNO_BUFFERHUB"],

            exclude_srcs: [

                "BufferHubConsumer.cpp",

                "BufferHubProducer.cpp",

            ],

            exclude_shared_libs: [

                "libbufferhubqueue",

                "libpdx_default_transport",

            ],

        },

    },



    header_libs: [

        "libdvr_headers",

        "libnativebase_headers",

        "libgui_headers",

        "libpdx_headers",

    ],



    export_shared_lib_headers: [

libs/gui/BufferQueue.cpp

+5 −0
Original line number Diff line number Diff line
@@ -18,8 +18,11 @@ 
#define ATRACE_TAG ATRACE_TAG_GRAPHICS

//#define LOG_NDEBUG 0



#ifndef NO_BUFFERHUB

#include <gui/BufferHubConsumer.h>

#include <gui/BufferHubProducer.h>

#endif



#include <gui/BufferQueue.h>

#include <gui/BufferQueueConsumer.h>

#include <gui/BufferQueueCore.h>
@@ -103,6 +106,7 @@ void BufferQueue::createBufferQueue(sp<IGraphicBufferProducer>* outProducer, 
    *outConsumer = consumer;

}



#ifndef NO_BUFFERHUB

void BufferQueue::createBufferHubQueue(sp<IGraphicBufferProducer>* outProducer,

                                       sp<IGraphicBufferConsumer>* outConsumer) {

    LOG_ALWAYS_FATAL_IF(outProducer == NULL, "BufferQueue: outProducer must not be NULL");
@@ -128,5 +132,6 @@ void BufferQueue::createBufferHubQueue(sp<IGraphicBufferProducer>* outProducer, 
    *outProducer = producer;

    *outConsumer = consumer;

}

#endif



}; // namespace android

libs/gui/IGraphicBufferProducer.cpp

+6 −0
Original line number Diff line number Diff line
@@ -27,7 +27,9 @@ 
#include <binder/Parcel.h>

#include <binder/IInterface.h>



#ifndef NO_BUFFERHUB

#include <gui/BufferHubProducer.h>

#endif

#include <gui/BufferQueueDefs.h>

#include <gui/IGraphicBufferProducer.h>

#include <gui/IProducerListener.h>
@@ -706,6 +708,7 @@ sp<IGraphicBufferProducer> IGraphicBufferProducer::createFromParcel(const Parcel 
        }

        case USE_BUFFER_HUB: {

            ALOGE("createFromParcel: BufferHub not implemented.");

#ifndef NO_BUFFERHUB

            dvr::ProducerQueueParcelable producerParcelable;

            res = producerParcelable.readFromParcel(parcel);

            if (res != NO_ERROR) {
@@ -713,6 +716,9 @@ sp<IGraphicBufferProducer> IGraphicBufferProducer::createFromParcel(const Parcel 
                return nullptr;

            }

            return BufferHubProducer::Create(std::move(producerParcelable));

#else

            return nullptr;

#endif

        }

        default: {

            ALOGE("createFromParcel: Unexpected mgaic: 0x%x.", outMagic);

libs/gui/include/gui/BufferQueue.h

+2 −0
Original line number Diff line number Diff line
@@ -79,9 +79,11 @@ public: 
            sp<IGraphicBufferConsumer>* outConsumer,

            bool consumerIsSurfaceFlinger = false);



#ifndef NO_BUFFERHUB

    // Creates an IGraphicBufferProducer and IGraphicBufferConsumer pair backed by BufferHub.

    static void createBufferHubQueue(sp<IGraphicBufferProducer>* outProducer,

                                     sp<IGraphicBufferConsumer>* outConsumer);

#endif



    BufferQueue() = delete; // Create through createBufferQueue

};

libs/ui/Android.bp

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

        "libhidltransport",

        "libhwbinder",

        "libpdx_default_transport",

        "libsync",

        "libutils",

        "libutilscallstack",
@@ -106,6 +105,7 @@ cc_library_shared { 
        "libnativebase_headers",

        "libhardware_headers",

        "libui_headers",

        "libpdx_headers",

    ],



    export_static_lib_headers: [