From a61ca2a8721743dd79768e14a66a94da691d1553 Mon Sep 17 00:00:00 2001 From: Nolan Scobie Date: Wed, 7 Dec 2022 11:48:27 -0500 Subject: [PATCH] Add librenderengine_deps to targets depending on librenderengine See I46750a0336a29d8d32ad2cb79a71c90461272fce for context. Bug: 259248961 Test: presubmit builds Change-Id: Ibd8b75406bd79dab6bc20aeaad0d08c9fcdfeb41 --- graphics/composer/2.2/utils/vts/Android.bp | 1 + graphics/composer/2.2/vts/functional/Android.bp | 3 +-- graphics/composer/aidl/vts/Android.bp | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/graphics/composer/2.2/utils/vts/Android.bp b/graphics/composer/2.2/utils/vts/Android.bp index 478e2b7a33..d11592f512 100644 --- a/graphics/composer/2.2/utils/vts/Android.bp +++ b/graphics/composer/2.2/utils/vts/Android.bp @@ -29,6 +29,7 @@ cc_library_static { "android.hardware.graphics.allocator-ndk_static", "android.hardware.graphics.composer3-ndk_static", "hidl_defaults", + "librenderengine_deps", ], srcs: [ "ComposerVts.cpp", diff --git a/graphics/composer/2.2/vts/functional/Android.bp b/graphics/composer/2.2/vts/functional/Android.bp index c693d35b68..34763766da 100644 --- a/graphics/composer/2.2/vts/functional/Android.bp +++ b/graphics/composer/2.2/vts/functional/Android.bp @@ -29,8 +29,7 @@ cc_test { "VtsHalTargetTestDefaults", "android.hardware.graphics.allocator-ndk_static", "android.hardware.graphics.composer3-ndk_static", - // Needed for librenderengine - "skia_deps", + "librenderengine_deps", ], tidy_timeout_srcs: [ "VtsHalGraphicsComposerV2_2ReadbackTest.cpp", diff --git a/graphics/composer/aidl/vts/Android.bp b/graphics/composer/aidl/vts/Android.bp index cbd2da5fe0..88b5de41bb 100644 --- a/graphics/composer/aidl/vts/Android.bp +++ b/graphics/composer/aidl/vts/Android.bp @@ -28,8 +28,7 @@ cc_test { defaults: [ "VtsHalTargetTestDefaults", "use_libaidlvintf_gtest_helper_static", - // Needed for librenderengine - "skia_deps", + "librenderengine_deps", "android.hardware.graphics.common-ndk_static", "android.hardware.graphics.composer3-ndk_static", ],