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

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

Merge "graphics.common V3 -> V4" am: 06c4f5fd 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2292293



Change-Id: Ib1037e710727f142e140d033a8da63c3eec941f7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 292a625e 06c4f5fd

libs/hwui/Android.bp

+3 −1
Original line number Diff line number Diff line
@@ -93,6 +93,9 @@ cc_defaults { 


cc_defaults {

    name: "hwui_static_deps",

    defaults: [

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

    ],

    shared_libs: [

        "libbase",

        "libharfbuzz_ng",
@@ -106,7 +109,6 @@ cc_defaults { 
    target: {

        android: {

            shared_libs: [

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

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

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

                "liblog",

services/core/jni/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ cc_library_static { 


cc_defaults {

    name: "libservices.core-libs",

    defaults: ["android.hardware.graphics.common-ndk_shared"],

    shared_libs: [

        "libadb_pairing_server",

        "libadb_pairing_connection",
@@ -159,7 +160,6 @@ cc_defaults { 
        "android.hardware.graphics.bufferqueue@1.0",

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

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

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

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

        "android.hardware.input.processor-V1-ndk",

        "android.hardware.ir@1.0",

services/tests/mockingservicestests/jni/Android.bp

+2 −1
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ package { 
cc_library_shared {

    name: "libmockingservicestestjni",



    defaults: ["android.hardware.graphics.common-ndk_shared"],



    cflags: [

        "-Wall",

        "-Werror",
@@ -48,7 +50,6 @@ cc_library_shared { 
        "android.hardware.graphics.bufferqueue@1.0",

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

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

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

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

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

    ],