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

Commit e58e8658 authored by Ady Abraham's avatar Ady Abraham Committed by Android (Google) Code Review
Browse files

Merge "SF: rev android.hardware.graphics.common to V3"

parents 38d705ef dc0f1583

libs/gralloc/types/Android.bp

+4 −4
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ cc_library { 
    target: {

        darwin: {

            enabled: false,

        }

        },

    },



    vendor_available: true,
@@ -48,18 +48,18 @@ cc_library { 
    min_sdk_version: "29",



    srcs: [

        "Gralloc4.cpp"

        "Gralloc4.cpp",

    ],



    shared_libs: [

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

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

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

        "libhidlbase",

        "liblog",

    ],



    export_shared_lib_headers: [

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

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

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

        "libhidlbase",

    ],

libs/ui/Android.bp

+4 −4
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ cc_library_static { 
    target: {

        windows: {

            enabled: true,

        }

        },

    },



    defaults: [
@@ -159,7 +159,7 @@ cc_library_shared { 
        "android.hardware.graphics.allocator@2.0",

        "android.hardware.graphics.allocator@3.0",

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

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

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

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

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

        "android.hardware.graphics.mapper@2.1",
@@ -176,7 +176,7 @@ cc_library_shared { 


    export_shared_lib_headers: [

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

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

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

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

        "libgralloctypes",

    ],
@@ -266,6 +266,6 @@ filegroup { 
        "Rect.cpp",

        "Region.cpp",

        "PixelFormat.cpp",

        "Transform.cpp"

        "Transform.cpp",

    ],

}

services/surfaceflinger/tests/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ cc_test { 
        "android.hardware.graphics.composer@2.1",

    ],

    shared_libs: [

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

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

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

        "libandroid",

        "libbase",