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

Commit eaa8469b authored by Steven Moreland's avatar Steven Moreland Committed by Android (Google) Code Review
Browse files

Merge "graphics.common V3 -> V4"

parents ef10dc0e ed27779d
Loading
Loading
Loading
Loading
+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",
            ],
        },
    ],
+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ aidl_interface {
        "android.hardware.common.fmq-V1",
        "android.hardware.camera.common-V1",
        "android.hardware.camera.metadata-V2",
        "android.hardware.graphics.common-V3",
        "android.hardware.graphics.common-V4",
    ],
    backend: {
        cpp: {
@@ -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",
            ],
        },
    ],
+2 −2
Original line number Diff line number Diff line
@@ -33,14 +33,14 @@ cc_defaults {
cc_defaults {
    name: "android.hardware.graphics.common-ndk_static",
    static_libs: [
        "android.hardware.graphics.common-V3-ndk",
        "android.hardware.graphics.common-V4-ndk",
    ],
}

cc_defaults {
    name: "android.hardware.graphics.common-ndk_shared",
    shared_libs: [
        "android.hardware.graphics.common-V3-ndk",
        "android.hardware.graphics.common-V4-ndk",
    ],
}

+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: "3",
    vndk_use_version: "4",
    srcs: [
        "android/hardware/graphics/common/*.aidl",
    ],
+2 −2
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ aidl_interface {
    ],
    stability: "vintf",
    imports: [
        "android.hardware.graphics.common-V3",
        "android.hardware.graphics.common-V4",
        "android.hardware.common-V2",
    ],
    backend: {
@@ -57,7 +57,7 @@ aidl_interface {
        {
            version: "1",
            imports: [
                "android.hardware.graphics.common-V3",
                "android.hardware.graphics.common-V4",
                "android.hardware.common-V2",
            ],
        },
Loading