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

Commit a4b36212 authored by Eino-Ville Talvala (Eddy)'s avatar Eino-Ville Talvala (Eddy) Committed by Xin Li
Browse files

Merge "Graphics: Migrate graphics.common HAL to version 6" into main am: 584871b6 

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



Merged-In: I542c1c638b9d63c2510b11d04d6ed98477780af7
Change-Id: I3b966ded616dbe2403791b1c04568bf46c3edca7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fc9e09be 584871b6

automotive/evs/aidl/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -55,14 +55,14 @@ aidl_interface { 
            version: "1",

            imports: [

                "android.hardware.common-V2",

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

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

            ],

        },

        {

            version: "2",

            imports: [

                "android.hardware.common-V2",

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

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

            ],

        },

camera/device/aidl/Android.bp

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

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

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

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

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

            ],

        },

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

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

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

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

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

            ],

        },

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

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

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

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

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

            ],

        },

graphics/Android.bp

+4 −4
Original line number Diff line number Diff line
@@ -56,28 +56,28 @@ cc_defaults { 
aidl_interface_defaults {

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

    imports: [

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

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

    ],

}



rust_defaults {

    name: "android.hardware.graphics.common-latest-rust",

    rustlibs: [

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

        "android.hardware.graphics.common-V6-rust",

    ],

}



cc_defaults {

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

    static_libs: [

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

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

    ],

}



cc_defaults {

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

    shared_libs: [

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

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

    ],

}

graphics/allocator/aidl/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ aidl_interface { 
            version: "2",

            imports: [

                "android.hardware.common-V2",

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

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

            ],

        },

graphics/composer/aidl/Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -59,21 +59,21 @@ aidl_interface { 
        {

            version: "1",

            imports: [

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

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

                "android.hardware.common-V2",

            ],

        },

        {

            version: "2",

            imports: [

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

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

                "android.hardware.common-V2",

            ],

        },

        {

            version: "3",

            imports: [

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

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

                "android.hardware.common-V2",

            ],

        },