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

Commit 650fe3ed authored by John Reck's avatar John Reck
Browse files

Remove mapper from composer2.3 VTS 

It was unused anyway

Bug: 292584923
Test: make VtsHalGraphicsComposerV2_3TargetTest
Change-Id: I81fb1be275ef54062a8ae5bddec17a137dda7946
parent 7f996c3f

graphics/composer/2.3/vts/functional/Android.bp

+0 −11
Original line number Diff line number Diff line
@@ -40,25 +40,14 @@ cc_test { 
        "libhidlbase",

        "libsync",

        "android.hardware.common-V2-ndk",

        "android.hardware.graphics.mapper@2.0",

        "android.hardware.graphics.mapper@2.1",

        "android.hardware.graphics.mapper@3.0",

        "android.hardware.graphics.mapper@4.0",

    ],

    static_libs: [

        "android.hardware.graphics.allocator@2.0",

        "android.hardware.graphics.allocator@3.0",

        "android.hardware.graphics.allocator@4.0",

        "android.hardware.graphics.composer@2.1",

        "android.hardware.graphics.composer@2.1-vts",

        "android.hardware.graphics.composer@2.2",

        "android.hardware.graphics.composer@2.2-vts",

        "android.hardware.graphics.composer@2.3",

        "android.hardware.graphics.composer@2.3-vts",

        "android.hardware.graphics.mapper@2.0-vts",

        "android.hardware.graphics.mapper@2.1-vts",

        "android.hardware.graphics.mapper@3.0-vts",

        "android.hardware.graphics.mapper@4.0-vts",

        "libaidlcommonsupport",

    ],

    header_libs: [

graphics/composer/2.3/vts/functional/VtsHalGraphicsComposerV2_3TargetTest.cpp

+0 −8
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 


#include <android-base/logging.h>

#include <android-base/properties.h>

#include <android/hardware/graphics/mapper/2.0/IMapper.h>

#include <composer-command-buffer/2.3/ComposerCommandBuffer.h>

#include <composer-vts/2.1/GraphicsComposerCallback.h>

#include <composer-vts/2.1/TestCommandReader.h>
@@ -29,7 +28,6 @@ 
#include <gtest/gtest.h>

#include <hidl/GtestPrinter.h>

#include <hidl/ServiceManagement.h>

#include <mapper-vts/2.0/MapperVts.h>



namespace android {

namespace hardware {
@@ -43,7 +41,6 @@ using common::V1_1::RenderIntent; 
using common::V1_2::ColorMode;

using common::V1_2::Dataspace;

using common::V1_2::PixelFormat;

using V2_2::vts::Gralloc;



class GraphicsComposerHidlTest : public ::testing::TestWithParam<std::string> {

  protected:
@@ -128,8 +125,6 @@ class GraphicsComposerHidlCommandTest : public GraphicsComposerHidlTest { 
    void SetUp() override {

        ASSERT_NO_FATAL_FAILURE(GraphicsComposerHidlTest::SetUp());



        ASSERT_NO_FATAL_FAILURE(mGralloc = std::make_unique<Gralloc>());



        mWriter = std::make_unique<CommandWriterBase>(1024);

        mReader = std::make_unique<V2_1::vts::TestCommandReader>();

    }
@@ -143,9 +138,6 @@ class GraphicsComposerHidlCommandTest : public GraphicsComposerHidlTest { 


    std::unique_ptr<CommandWriterBase> mWriter;

    std::unique_ptr<V2_1::vts::TestCommandReader> mReader;



   private:

    std::unique_ptr<Gralloc> mGralloc;

};



/**