commit 6920a2fa2f3ba00b7774eee26b956defd43b755e
author Sally Qi <sallyqi@google.com> Fri Aug 26 10:40:05 2022 -0700
committer Sally Qi <sallyqi@google.com> Fri Aug 26 15:12:55 2022 -0700
tree fb4c1205ed2387ba108c595c0b074f3cf1b629f7
parent 0ce871c65183b2c39bef22a5fc294102dbf53a1a

Use android.hardware.graphics.common-ndk and composer3-ndk wrappers.

Bug: 243429120
Test: builds
Change-Id: I2edd9d7f22680335f2924c544031d181071bf6f7

services/surfaceflinger/CompositionEngine/Android.bp

diff --git a/services/surfaceflinger/CompositionEngine/Android.bp b/services/surfaceflinger/CompositionEngine/Android.bp
index 11a9e19..b5d2ad0 100644
--- a/services/surfaceflinger/CompositionEngine/Android.bp
+++ b/services/surfaceflinger/CompositionEngine/Android.bp
@@ -9,7 +9,10 @@
 
 cc_defaults {
     name: "libcompositionengine_defaults",
-    defaults: ["surfaceflinger_defaults"],
+    defaults: [
+        "android.hardware.graphics.composer3-ndk_shared",
+        "surfaceflinger_defaults",
+    ],
     cflags: [
         "-DLOG_TAG=\"CompositionEngine\"",
         "-DATRACE_TAG=ATRACE_TAG_GRAPHICS",
@@ -20,7 +23,6 @@
         "android.hardware.graphics.composer@2.2",
         "android.hardware.graphics.composer@2.3",
         "android.hardware.graphics.composer@2.4",
-        "android.hardware.graphics.composer3-V1-ndk",
         "android.hardware.power@1.0",
         "android.hardware.power@1.3",
         "android.hardware.power-V2-cpp",