From 126c03837fb82a9480a011efe177d3aa7b93ac58 Mon Sep 17 00:00:00 2001 From: Sally Qi Date: Mon, 22 Aug 2022 14:05:45 -0700 Subject: [PATCH] Use android.hardware.graphics.common-ndk and composer3-ndk wrappers. - To avoid tediously update android.hardware.graphics.composer3-V*-ndk and android.hardware.graphics.common-V*-ndk on all users, use wrappers instead. Bug: 243429120 Test: builds Change-Id: I1418307159dbaa9d2acc44997f13a41d629d56c0 Merged-In: I1418307159dbaa9d2acc44997f13a41d629d56c0 (cherry picked from commit 3ea28f19853903560d4d202c57300887b464141c) (cherry picked from commit 96989f343b09794b29e6d226c361aa732c9d1533) --- libs/hwui/Android.bp | 6 ++++-- services/core/jni/Android.bp | 2 +- services/tests/mockingservicestests/jni/Android.bp | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libs/hwui/Android.bp b/libs/hwui/Android.bp index 33f79352b8b88..171e073dfce05 100644 --- a/libs/hwui/Android.bp +++ b/libs/hwui/Android.bp @@ -93,6 +93,10 @@ cc_defaults { cc_defaults { name: "hwui_static_deps", + defaults: [ + "android.hardware.graphics.common-ndk_shared", + "android.hardware.graphics.composer3-ndk_shared", + ], shared_libs: [ "libbase", "libharfbuzz_ng", @@ -106,9 +110,7 @@ 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", "libcutils", "libutils", diff --git a/services/core/jni/Android.bp b/services/core/jni/Android.bp index 93a4ebffc12c3..8e0dc5da4dbc8 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 f454ac7e9e4b3..f1dc1fa1a108d 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", ],