commit 126c03837fb82a9480a011efe177d3aa7b93ac58
author Sally Qi <sallyqi@google.com> Mon Aug 22 14:05:45 2022 -0700
committer Marc Kassis <mnkassis@google.com> Thu Dec 08 08:31:03 2022 +0000
tree a5d1df757c2bc0c984cf0d613a90be1fa341190b
parent 94a93e3bcda97fbe4a3a52b19a904e5c26259a37

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

diff --git a/libs/hwui/Android.bp b/libs/hwui/Android.bp
index 33f7935..171e073 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",