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

Commit a89952b6 authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "graphics.common V3 -> V4" am: 470cae3e 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2292234



Change-Id: Id0ef01c4b7bf19e102199604200ee68af4509250
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 672c2c2d 470cae3e

libs/gralloc/types/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -51,14 +51,14 @@ cc_library { 
    ],



    shared_libs: [

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

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

        "android.hardware.graphics.mapper@4.0",

        "libhidlbase",

        "liblog",

    ],



    export_shared_lib_headers: [

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

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

        "android.hardware.graphics.mapper@4.0",

        "libhidlbase",

    ],

libs/gui/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ cc_defaults { 
        "android.hardware.graphics.bufferqueue@2.0",

        "android.hardware.graphics.common@1.1",

        "android.hardware.graphics.common@1.2",

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

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

        "android.hidl.token@1.0-utils",

        "libbase",

        "libcutils",

libs/shaders/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ cc_library_static { 
    local_include_dirs: ["include"],



    shared_libs: [

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

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

        "android.hardware.graphics.composer3-V1-ndk",

        "android.hardware.graphics.common@1.2",

        "libnativewindow",

libs/shaders/tests/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ cc_test { 
        "libtonemap_headers",

    ],

    shared_libs: [

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

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

        "android.hardware.graphics.composer3-V1-ndk",

        "android.hardware.graphics.common@1.2",

        "libnativewindow",

libs/tonemap/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ cc_library_static { 
    local_include_dirs: ["include"],



    shared_libs: [

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

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

        "android.hardware.graphics.composer3-V1-ndk",

        "liblog",

        "libnativewindow",