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

Commit 31b637fd authored by Sergiu Ferentz's avatar Sergiu Ferentz Committed by Android (Google) Code Review
Browse files

Merge "Bump android.hardware.graphics.common V4->V5" into main

parents d2075f0d 7d7a24d5

automotive/evs/aidl/Android.bp

+3 −3
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-V4",

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

    ],

    backend: {

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

            imports: [

                "android.hardware.common-V2",

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

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

            ],

        },

        {

            version: "2",

            imports: [

                "android.hardware.common-V2",

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

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

            ],

        },

camera/device/aidl/Android.bp

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

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

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

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

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

    ],

    backend: {

        cpp: {
@@ -37,7 +37,7 @@ aidl_interface { 
                "android.hardware.common.fmq-V1",

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

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

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

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

            ],

        },

        {
@@ -47,7 +47,7 @@ aidl_interface { 
                "android.hardware.common.fmq-V1",

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

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

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

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

            ],

        },

graphics/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -39,14 +39,14 @@ cc_defaults { 
cc_defaults {

    name: "android.hardware.graphics.common-ndk_static",

    static_libs: [

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

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

    ],

}



cc_defaults {

    name: "android.hardware.graphics.common-ndk_shared",

    shared_libs: [

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

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

    ],

}

graphics/allocator/aidl/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ aidl_interface { 
    srcs: ["android/hardware/graphics/allocator/*.aidl"],

    imports: [

        "android.hardware.common-V2",

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

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

    ],

    stability: "vintf",

    backend: {
@@ -49,7 +49,7 @@ aidl_interface { 
            version: "2",

            imports: [

                "android.hardware.common-V2",

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

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

            ],

        },

graphics/common/aidl/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ aidl_interface { 
        enabled: true,

        support_system_process: true,

    },

    vndk_use_version: "4",

    vndk_use_version: "5",

    srcs: [

        "android/hardware/graphics/common/*.aidl",

    ],