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

Commit a65c9af0 authored by Eino-Ville Talvala's avatar Eino-Ville Talvala
Browse files

Graphics: Add Rust and AIDL defaults for graphics HALS, migrate usages 

- Add new defaults for Rust and AIDL graphics HAL library references
- Migrate HAL interfaces to use new AIDL defaults

This is in preparation for upgrading the graphics.common HAL to V6.

Test: Builds
Bug: 368395888
Flag: EXEMPT build changes
Merged-In: I9d312328255226fbd7162b9dfd151dfa823f1858
Change-Id: I9d312328255226fbd7162b9dfd151dfa823f1858
parent c2723cde

automotive/evs/aidl/Android.bp

+3 −1
Original line number Diff line number Diff line
@@ -28,9 +28,11 @@ aidl_interface { 
        "android/hardware/automotive/evs/*.aidl",

    ],

    stability: "vintf",

    defaults: [

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

    ],

    imports: [

        "android.hardware.common-V2",

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

    ],

    backend: {

        java: {

camera/device/aidl/Android.bp

+3 −1
Original line number Diff line number Diff line
@@ -14,12 +14,14 @@ aidl_interface { 
    srcs: ["android/hardware/camera/device/*.aidl"],

    frozen: true,

    stability: "vintf",

    defaults: [

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

    ],

    imports: [

        "android.hardware.common-V2",

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

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

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

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

    ],

    backend: {

        cpp: {

graphics/Android.bp

+38 −0
Original line number Diff line number Diff line
@@ -16,6 +16,23 @@ package { 
    default_applicable_licenses: ["hardware_interfaces_license"],

}



aidl_interface_defaults {

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

    imports: [

        "android.hardware.graphics.allocator-V2",

    ],

}



rust_defaults {

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

    rustlibs: [

        "android.hardware.graphics.allocator-V2-rust",

    ],

    defaults: [

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

    ],

}



cc_defaults {

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

    static_libs: [
@@ -36,6 +53,20 @@ cc_defaults { 
    ],

}



aidl_interface_defaults {

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

    imports: [

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

    ],

}



rust_defaults {

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

    rustlibs: [

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

    ],

}



cc_defaults {

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

    static_libs: [
@@ -50,6 +81,13 @@ cc_defaults { 
    ],

}



aidl_interface_defaults {

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

    imports: [

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

    ],

}



cc_defaults {

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

    static_libs: [

graphics/allocator/aidl/Android.bp

+3 −1
Original line number Diff line number Diff line
@@ -13,9 +13,11 @@ aidl_interface { 
    vendor_available: true,

    double_loadable: true,

    srcs: ["android/hardware/graphics/allocator/*.aidl"],

    defaults: [

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

    ],

    imports: [

        "android.hardware.common-V2",

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

    ],

    stability: "vintf",

    backend: {

graphics/composer/aidl/Android.bp

+3 −1
Original line number Diff line number Diff line
@@ -34,8 +34,10 @@ aidl_interface { 
        "android/hardware/graphics/composer3/*.aidl",

    ],

    stability: "vintf",

    defaults: [

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

    ],

    imports: [

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

        "android.hardware.common-V2",

    ],

    backend: {