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

Commit a33bce86 authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "graphics.common V3 -> V4" am: 2e37f012 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2292036



Change-Id: I70a1ba9242ed8cebda22b2e7223e33c0dc402561
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ed6ebed9 2e37f012

automotive/evs/aidl/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ aidl_interface { 
    stability: "vintf",

    imports: [

        "android.hardware.common-V2",

        "android.hardware.graphics.common-V3",

        "android.hardware.graphics.common-V4",

    ],

    backend: {

        java: {
@@ -53,7 +53,7 @@ aidl_interface { 
            version: "1",

            imports: [

                "android.hardware.common-V2",

                "android.hardware.graphics.common-V3",

                "android.hardware.graphics.common-V4",

            ],

        },

    ],

automotive/evs/aidl/impl/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ cc_defaults { 
    static_libs: [

        "android.hardware.automotive.evs-V1-ndk",

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

        "android.hardware.graphics.common-V3-ndk",

        "android.hardware.graphics.common-V4-ndk",

    ],

    shared_libs: [

        "libbase",

automotive/evs/aidl/vts/Android.bp

+4 −5
Original line number Diff line number Diff line
@@ -24,8 +24,7 @@ package{ 
}



cc_test {

name:

    "VtsHalEvsTargetTest",

    name: "VtsHalEvsTargetTest",

    srcs: [

        "*.cpp",

    ],
@@ -43,7 +42,7 @@ name: 
        "android.hardware.automotive.evs@common-default-lib",

        "android.hardware.automotive.evs-V1-ndk",

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

        "android.hardware.graphics.common-V3-ndk",

        "android.hardware.graphics.common-V4-ndk",

        "libaidlcommonsupport",

    ],

    test_suites: [

camera/device/aidl/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ aidl_interface { 
                "android.hardware.common.fmq-V1",

                "android.hardware.camera.common-V1",

                "android.hardware.camera.metadata-V1",

                "android.hardware.graphics.common-V3",

                "android.hardware.graphics.common-V4",

            ],

        },

    ],

camera/provider/aidl/vts/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ cc_test { 
        "android.hardware.camera.device-V1-ndk",

        "android.hardware.camera.metadata-V1-ndk",

        "android.hardware.camera.provider-V1-ndk",

        "android.hardware.graphics.common-V3-ndk",

        "android.hardware.graphics.common-V4-ndk",

        "android.hidl.allocator@1.0",

        "libgrallocusage",

        "libhidlmemory",