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

Commit 46519ddb authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove unused dependencies from composer3 VTS" into main

parents d49a7d48 e849ecd0

graphics/composer/aidl/vts/Android.bp

+0 −14
Original line number Diff line number Diff line
@@ -55,13 +55,6 @@ cc_test { 
        "libhidlbase",

        "libprocessgroup",

        "libtinyxml2",

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

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

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

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

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

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

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

        "libvndksupport",

    ],

    header_libs: [
@@ -71,13 +64,6 @@ cc_test { 
        "android.hardware.graphics.common@1.2",

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

        "android.hardware.common.fmq-V1-ndk",

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

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

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

        "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",

        "libarect",

        "libbase",

graphics/composer/aidl/vts/ReadbackVts.h

+0 −2
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
#include <android-base/unique_fd.h>

#include <android/hardware/graphics/composer3/ComposerClientReader.h>

#include <android/hardware/graphics/composer3/ComposerClientWriter.h>

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

#include <renderengine/RenderEngine.h>

#include <ui/GraphicBuffer.h>

#include <memory>
@@ -32,7 +31,6 @@ namespace aidl::android::hardware::graphics::composer3::vts { 
using ::android::renderengine::LayerSettings;

using common::Dataspace;

using common::PixelFormat;

using IMapper2_1 = ::android::hardware::graphics::mapper::V2_1::IMapper;



static const Color BLACK = {0.0f, 0.0f, 0.0f, 1.0f};

static const Color RED = {1.0f, 0.0f, 0.0f, 1.0f};

graphics/composer/aidl/vts/RenderEngineVts.cpp

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 


namespace aidl::android::hardware::graphics::composer3::vts {



using ::android::hardware::graphics::mapper::V2_1::IMapper;

using ::android::renderengine::DisplaySettings;

using ::android::renderengine::LayerSettings;

using ::android::renderengine::RenderEngineCreationArgs;

graphics/composer/aidl/vts/RenderEngineVts.h

+0 −2
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
 */

#pragma once



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

#include <math/half.h>

#include <math/vec3.h>

#include <renderengine/ExternalTexture.h>
@@ -29,7 +28,6 @@ 


namespace aidl::android::hardware::graphics::composer3::vts {



using ::android::hardware::graphics::mapper::V2_1::IMapper;

using ::android::renderengine::DisplaySettings;

using ::android::renderengine::ExternalTexture;

using ::android::renderengine::RenderEngineCreationArgs;