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

Commit 412f907b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Tweak IMapper 4.0 VTS to run with AIDL IAllocator" into tm-dev

parents aff537b7 38ccfd7a

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

+2 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ cc_library_static { 
        "TestCommandReader.cpp",

    ],

    static_libs: [

        "android.hardware.graphics.allocator-V1-ndk",

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

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

        "android.hardware.graphics.mapper@3.0-vts",
@@ -39,6 +40,7 @@ cc_library_static { 
        "libgtest",

    ],

    export_static_lib_headers: [

        "android.hardware.graphics.allocator-V1-ndk",

        "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

+1 −1
Original line number Diff line number Diff line
@@ -318,7 +318,7 @@ Gralloc::Gralloc() { 
    [this] {

        ASSERT_NO_FATAL_FAILURE(mGralloc4 = std::make_shared<Gralloc4>("default", "default",

                                                                       /*errOnFailure=*/false));

        if (mGralloc4->getAllocator() == nullptr || mGralloc4->getMapper() == nullptr) {

        if (!mGralloc4->hasAllocator() || mGralloc4->getMapper() == nullptr) {

            mGralloc4 = nullptr;

            ASSERT_NO_FATAL_FAILURE(mGralloc3 = std::make_shared<Gralloc3>("default", "default",

                                                                           /*errOnFailure=*/false));

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

+8 −1
Original line number Diff line number Diff line
@@ -32,14 +32,17 @@ cc_test { 
    // TODO(b/64437680): Assume these libs are always available on the device.

    shared_libs: [

        "libbase",

        "libbinder_ndk",

        "libfmq",

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

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

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

        "android.hardware.graphics.allocator@4.0",
@@ -49,10 +52,14 @@ cc_test { 
        "android.hardware.graphics.mapper@2.1-vts",

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

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

        "libaidlcommonsupport",

    ],

    header_libs: [

        "android.hardware.graphics.composer@2.1-command-buffer",

    ],

    disable_framework: true,

    test_suites: ["general-tests", "vts"],

    test_suites: [

        "general-tests",

        "vts",

    ],

}

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

+2 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ cc_library_static { 
        "libui",

    ],

    static_libs: [

        "android.hardware.graphics.allocator-V1-ndk",

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

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

        "android.hardware.graphics.composer3-V1-ndk",
@@ -52,6 +53,7 @@ cc_library_static { 
        "android.hardware.graphics.mapper@4.0-vts",

    ],

    export_static_lib_headers: [

        "android.hardware.graphics.allocator-V1-ndk",

        "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

+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ Gralloc::Gralloc() { 
        ALOGD("Attempting to initialize gralloc4");

        ASSERT_NO_FATAL_FAILURE(mGralloc4 = std::make_shared<Gralloc4>("default", "default",

                                                                       /*errOnFailure=*/false));

        if (mGralloc4->getMapper() == nullptr || mGralloc4->getAllocator() == nullptr) {

        if (mGralloc4->getMapper() == nullptr || !mGralloc4->hasAllocator()) {

            mGralloc4 = nullptr;

            ALOGD("Failed to initialize gralloc4, initializing gralloc3");

            ASSERT_NO_FATAL_FAILURE(mGralloc3 = std::make_shared<Gralloc3>("default", "default",