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

Commit adbeed03 authored by Dan Shi's avatar Dan Shi Committed by Android (Google) Code Review
Browse files

Merge "Remove reference of VtsHalHidlTargetTestBase"

parents f78e2af7 b5fd31a1

graphics/composer/2.1/utils/vts/Android.bp

+1 −2
Original line number Diff line number Diff line
@@ -23,14 +23,13 @@ cc_library_static { 
        "TestCommandReader.cpp",

    ],

    static_libs: [

        "VtsHalHidlTargetTestBase",

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

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

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

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

        "libgtest",

    ],

    export_static_lib_headers: [

        "VtsHalHidlTargetTestBase",

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

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

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

graphics/composer/2.1/utils/vts/ComposerVts.cpp

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


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



#include <VtsHalHidlTargetTestBase.h>



namespace android {

namespace hardware {

namespace graphics {
@@ -25,11 +23,6 @@ namespace composer { 
namespace V2_1 {

namespace vts {



Composer::Composer() : Composer(::testing::VtsHalHidlTargetTestBase::getService<IComposer>()) {}



Composer::Composer(const std::string& name)

    : Composer(::testing::VtsHalHidlTargetTestBase::getService<IComposer>(name)) {}



Composer::Composer(const sp<IComposer>& composer) : mComposer(composer) {

    // ASSERT_* can only be used in functions returning void.

    [this] {

graphics/composer/2.2/utils/vts/Android.bp

+1 −2
Original line number Diff line number Diff line
@@ -26,11 +26,11 @@ cc_library_static { 
        "libui",

    ],

    static_libs: [

        "VtsHalHidlTargetTestBase",

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

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

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

        "libarect",

        "libgtest",

        "libmath",

        "libnativewindow",

        "librenderengine",
@@ -40,7 +40,6 @@ cc_library_static { 
        "android.hardware.graphics.mapper@4.0-vts",

    ],

    export_static_lib_headers: [

        "VtsHalHidlTargetTestBase",

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

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

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

graphics/composer/2.2/utils/vts/ComposerVts.cpp

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


#include <composer-vts/2.2/ComposerVts.h>



#include <VtsHalHidlTargetTestBase.h>

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

#include <hidl/HidlTransportUtils.h>

graphics/composer/2.2/utils/vts/include/composer-vts/2.2/ComposerVts.h

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
#include <unordered_set>

#include <vector>



#include <VtsHalHidlTargetTestBase.h>

#include <android/hardware/graphics/composer/2.2/IComposer.h>

#include <android/hardware/graphics/composer/2.2/IComposerClient.h>

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