From b470192eba2fb75babeddb0674f77ef58db23522 Mon Sep 17 00:00:00 2001 From: Jayant Chowdhary Date: Wed, 18 May 2022 06:32:34 +0000 Subject: Make VtsHalCameraService2_0TargetTest a vendor test. This is so that the vts test uses the vendor variant of vndk dependencies simulating what vendor clients would actually see. Bug: 231517902 Test: ldd VtsHalCameraService2_0TargetTest; See that it uses vendor variant of libcamera_metadata Change-Id: I038dee565f31351e762f1663356785279878a319 Signed-off-by: Jayant Chowdhary --- cameraservice/vts/functional/Android.bp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/cameraservice/vts/functional/Android.bp b/cameraservice/vts/functional/Android.bp index 26c09ec..1bca510 100644 --- a/cameraservice/vts/functional/Android.bp +++ b/cameraservice/vts/functional/Android.bp @@ -22,6 +22,7 @@ cc_test { name: "VtsHalCameraServiceV2_0TargetTest", defaults: ["VtsHalTargetTestDefaults"], + vendor: true, srcs: ["VtsHalCameraServiceV2_0TargetTest.cpp"], static_libs: [ "android.hardware.camera.common@1.0-helper", @@ -32,6 +33,7 @@ cc_test { "android.frameworks.cameraservice.service@2.2", "android.frameworks.cameraservice.common@2.0", "libfmq", + "libarect", ], shared_libs: [ "libcamera_metadata", @@ -40,10 +42,5 @@ cc_test { "liblog", ], - cflags: [ - // TODO: Currently vts tests can't be vendor:true tests if they use VtsHalHidlTargetTestBase - // (http://b/123320603). This is needed for libmediandk's llndk only api. - "-D__ANDROID_VNDK__", - ], test_suites: ["vts"], } -- cgit v1.2.3