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

Commit 98923fcc authored by Chia-I Wu's avatar Chia-I Wu
Browse files

graphics: make mapper VTS utils more reusable 

Better include path (#include <mapper-vts/2.0/MapperVts.h>), better
library naming, and move GraphicsMapperHidlEnvironment to where
tests are defined.

Test: VTS
Change-Id: I9fbf6515993ac11852b11ca6b8194a58afe5579a
parent 7d510c91

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

+1 −1
Original line number Diff line number Diff line
@@ -58,8 +58,8 @@ cc_test { 
        "android.hardware.graphics.allocator@2.0",

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

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

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

        "libVtsHalGraphicsComposerTestUtils",

        "libVtsHalGraphicsMapperTestUtils",

        "libnativehelper",

    ],

    header_libs: [

graphics/composer/2.1/vts/functional/VtsHalGraphicsComposerV2_1TargetTest.cpp

+2 −2
Original line number Diff line number Diff line
@@ -17,10 +17,10 @@ 
#define LOG_TAG "graphics_composer_hidl_hal_test"



#include <android-base/logging.h>

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

#include "GraphicsComposerCallback.h"

#include "TestCommandReader.h"

#include "VtsHalGraphicsComposerTestUtils.h"

#include "VtsHalGraphicsMapperTestUtils.h"



#include <VtsHalHidlTargetTestBase.h>

#include <VtsHalHidlTargetTestEnvBase.h>
@@ -48,7 +48,7 @@ using android::hardware::graphics::common::V1_0::Dataspace; 
using android::hardware::graphics::common::V1_0::PixelFormat;

using android::hardware::graphics::common::V1_0::Transform;

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

using android::hardware::graphics::mapper::V2_0::tests::Gralloc;

using android::hardware::graphics::mapper::V2_0::vts::Gralloc;

using GrallocError = android::hardware::graphics::mapper::V2_0::Error;



// Test environment for graphics.composer

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

+1 −1
Original line number Diff line number Diff line
@@ -61,10 +61,10 @@ cc_test { 
        "android.hardware.graphics.composer@2.2",

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

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

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

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

        "libVtsHalGraphicsComposerTestUtils",

        "libVtsHalGraphicsComposerTestUtils@2.2",

        "libVtsHalGraphicsMapperTestUtils",

        "libnativehelper",

    ],

    header_libs: [

graphics/composer/2.2/vts/functional/VtsHalGraphicsComposerV2_2TargetTest.cpp

+2 −2
Original line number Diff line number Diff line
@@ -18,12 +18,12 @@ 


#include <android-base/logging.h>

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

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

#include <sync/sync.h>

#include "2.2/VtsHalGraphicsComposerTestUtils.h"

#include "GraphicsComposerCallback.h"

#include "TestCommandReader.h"

#include "VtsHalGraphicsComposerTestUtils.h"

#include "VtsHalGraphicsMapperTestUtils.h"



#include <VtsHalHidlTargetTestBase.h>
@@ -43,7 +43,7 @@ using android::hardware::graphics::common::V1_0::PixelFormat; 
using android::hardware::graphics::common::V1_0::Transform;

using android::hardware::graphics::composer::V2_2::IComposerClient;

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

using android::hardware::graphics::mapper::V2_0::tests::Gralloc;

using android::hardware::graphics::mapper::V2_0::vts::Gralloc;

using GrallocError = android::hardware::graphics::mapper::V2_0::Error;



// Test environment for graphics.composer

graphics/mapper/2.0/utils/vts/Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -15,9 +15,9 @@ 
//



cc_library_static {

    name: "libVtsHalGraphicsMapperTestUtils",

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

    defaults: ["hidl_defaults"],

    srcs: ["VtsHalGraphicsMapperTestUtils.cpp"],

    srcs: ["MapperVts.cpp"],

    cflags: [

        "-O0",

        "-g",
@@ -34,5 +34,5 @@ cc_library_static { 
        "android.hardware.graphics.allocator@2.0",

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

    ],

    export_include_dirs: ["."],

    export_include_dirs: ["include"],

}