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

Commit 95e6875d authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Graphics: Add Rust and AIDL defaults for graphics HALS, migrate usages" into main

parents 79c86b7b a65c9af0
Loading
Loading
Loading
Loading
+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: {
+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: {
+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: [
+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: {
+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: {
Loading