From 63c8fea77878b06f9f625f538d2bd6ff92630752 Mon Sep 17 00:00:00 2001 From: Leon Scroggins III Date: Fri, 2 Feb 2024 13:03:43 -0500 Subject: [PATCH] VTS: Add flag dependency so librenderengine can be used I6c436b6b80b27930d82aabf22107216172773b56 adds a dependency for librenderengine on flags. Add that dependency so we can use librenderengine here, too. Bug: 305445199 Test: atest VtsHalGraphicsComposerV2_2TargetTest Test: atest VtsHalGraphicsComposer3_TargetTest Change-Id: If339ac94a6eff4af34e60cf1c1135289b8915441 --- graphics/composer/2.2/utils/vts/Android.bp | 2 ++ graphics/composer/2.2/vts/functional/Android.bp | 2 ++ graphics/composer/aidl/vts/Android.bp | 2 ++ 3 files changed, 6 insertions(+) diff --git a/graphics/composer/2.2/utils/vts/Android.bp b/graphics/composer/2.2/utils/vts/Android.bp index 2bd2419192..7157862884 100644 --- a/graphics/composer/2.2/utils/vts/Android.bp +++ b/graphics/composer/2.2/utils/vts/Android.bp @@ -38,6 +38,7 @@ cc_library_static { ], shared_libs: [ "libui", + "server_configurable_flags", ], static_libs: [ "android.hardware.graphics.composer@2.1-vts", @@ -48,6 +49,7 @@ cc_library_static { "libnativewindow", "librenderengine", "libshaders", + "libsurfaceflinger_common", "libtonemap", ], export_static_lib_headers: [ diff --git a/graphics/composer/2.2/vts/functional/Android.bp b/graphics/composer/2.2/vts/functional/Android.bp index dec60df467..bda41981ad 100644 --- a/graphics/composer/2.2/vts/functional/Android.bp +++ b/graphics/composer/2.2/vts/functional/Android.bp @@ -54,6 +54,7 @@ cc_test { "libsync", "libui", "android.hardware.common-V2-ndk", + "server_configurable_flags", ], static_libs: [ "android.hardware.graphics.common@1.1", @@ -66,6 +67,7 @@ cc_test { "librenderengine", "libshaders", "libtonemap", + "libsurfaceflinger_common", ], header_libs: [ "android.hardware.graphics.composer@2.1-command-buffer", diff --git a/graphics/composer/aidl/vts/Android.bp b/graphics/composer/aidl/vts/Android.bp index 658e0d5108..3464fe998b 100644 --- a/graphics/composer/aidl/vts/Android.bp +++ b/graphics/composer/aidl/vts/Android.bp @@ -56,6 +56,7 @@ cc_test { "libhidlbase", "libprocessgroup", "libvndksupport", + "server_configurable_flags", ], header_libs: [ "android.hardware.graphics.composer3-command-buffer", @@ -74,6 +75,7 @@ cc_test { "libshaders", "libsync", "libtonemap", + "libsurfaceflinger_common", ], cflags: [ "-Wconversion",