From 8c1f7e90ce613f21d4e60445ddf131e97c9cd907 Mon Sep 17 00:00:00 2001 From: Marc Kassis Date: Tue, 8 Nov 2022 16:18:49 +0100 Subject: graphics.common V3 -> V4 Bug: 251177105 Test: m Change-Id: I235c88f66650bd3290e8cddf57b0cf77278183ac Merged-In: I1418307159dbaa9d2acc44997f13a41d629d56c0 --- libs/hwui/Android.bp | 4 +++- services/core/jni/Android.bp | 2 +- services/tests/mockingservicestests/jni/Android.bp | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libs/hwui/Android.bp b/libs/hwui/Android.bp index 33f79352b8b8..c0220879094a 100644 --- a/libs/hwui/Android.bp +++ b/libs/hwui/Android.bp @@ -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", diff --git a/services/core/jni/Android.bp b/services/core/jni/Android.bp index 93a4ebffc12c..8e0dc5da4dbc 100644 --- a/services/core/jni/Android.bp +++ b/services/core/jni/Android.bp @@ -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", diff --git a/services/tests/mockingservicestests/jni/Android.bp b/services/tests/mockingservicestests/jni/Android.bp index f454ac7e9e4b..f1dc1fa1a108 100644 --- a/services/tests/mockingservicestests/jni/Android.bp +++ b/services/tests/mockingservicestests/jni/Android.bp @@ -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", ], -- cgit v1.2.3-59-g8ed1b