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

Commit aee98890 authored by Logan Chien's avatar Logan Chien
Browse files

Remove stale dependency to libhwc2on1adaptor.so. 

This commit removes stale dependency to libhwc2on1adaptor.  Since commit
831d48ed, mAdapter has become an unused private member.  In addition,
this unused unique_ptr leads to an unnecessary symbol reference to the
destructor of HWC2on1Adaptor.  This commit removes them completely.

Bug: 38302528
Test: Sailfish builds and boots.
Change-Id: I479f12ddbae91282a13464159f00513aa7cb3208
parent 4ed76e27

services/surfaceflinger/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -80,7 +80,6 @@ LOCAL_SHARED_LIBRARIES := \ 
    libdl \

    libfmq \

    libhardware \

    libhwc2on1adapter \

    libhidlbase \

    libhidltransport \

    libhwbinder \

services/surfaceflinger/DisplayHardware/HWComposer.cpp

+1 −3
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ 
#include <log/log.h>



#include "HWComposer.h"

#include "hwc2on1adapter/HWC2On1Adapter.h"

#include "HWC2.h"

#include "ComposerHal.h"
@@ -61,8 +60,7 @@ namespace android { 
// ---------------------------------------------------------------------------



HWComposer::HWComposer(bool useVrComposer)

    : mAdapter(),

      mHwcDevice(),

    : mHwcDevice(),

      mDisplayData(2),

      mFreeDisplaySlots(),

      mHwcDisplaySlots(),

services/surfaceflinger/DisplayHardware/HWComposer.h

+0 −2
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ class DisplayDevice; 
class Fence;

class FloatRect;

class GraphicBuffer;

class HWC2On1Adapter;

class NativeHandle;

class Region;

class String8;
@@ -205,7 +204,6 @@ private: 
        HWC2::Vsync vsyncEnabled;

    };



    std::unique_ptr<HWC2On1Adapter> mAdapter;

    std::unique_ptr<HWC2::Device>   mHwcDevice;

    std::vector<DisplayData>        mDisplayData;

    std::set<size_t>                mFreeDisplaySlots;