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
diff --git a/libs/hwui/Android.bp b/libs/hwui/Android.bp
index ad9aa6c..d512b60 100644
--- a/libs/hwui/Android.bp
+++ b/libs/hwui/Android.bp
@@ -93,6 +93,10 @@
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 @@
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",