From 7a998e53bca9ea4d7c70baf00bcae709aa4cc9d2 Mon Sep 17 00:00:00 2001 From: Tri Vo Date: Fri, 4 Aug 2017 16:38:23 -0700 Subject: [PATCH] Camera test statically links to dependencies. This test now statically links to HAL def libs which are not guaranteed to be on the device. Bug: 64040096 Test: vts-tradefed run commandAndExit vts --skip-all-system-status-check --skip-preconditions --module VtsHalCameraProviderV2_4Target Change-Id: Ib33fdfd45b10840cce363fcda291a62e56b1d4c8 --- camera/provider/2.4/vts/functional/Android.bp | 31 +++++++++---------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/camera/provider/2.4/vts/functional/Android.bp b/camera/provider/2.4/vts/functional/Android.bp index 439fe3dd67..84d76f1fbd 100644 --- a/camera/provider/2.4/vts/functional/Android.bp +++ b/camera/provider/2.4/vts/functional/Android.bp @@ -16,30 +16,27 @@ cc_test { name: "VtsHalCameraProviderV2_4TargetTest", - defaults: ["hidl_defaults"], + defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalCameraProviderV2_4TargetTest.cpp"], + + // TODO(b/64437680): Assume these are always available on the device. shared_libs: [ - "liblog", - "libhidlbase", - "libhidltransport", - "libcutils", - "libutils", - "android.hardware.camera.provider@2.4", - "android.hardware.camera.device@3.2", - "android.hardware.camera.device@1.0", - "libcamera_metadata", "libbinder", + "libcamera_metadata", + "libfmq", "libgui", "libui", - "libfmq", ], + + // Statically link to libs not guaranteed to be present on the device. static_libs: [ - "VtsHalHidlTargetTestBase", - "libgrallocusage", + "android.hardware.camera.common@1.0", "android.hardware.camera.common@1.0-helper", - ], - cflags: [ - "-O0", - "-g", + "android.hardware.camera.device@1.0", + "android.hardware.camera.device@3.2", + "android.hardware.camera.provider@2.4", + "android.hardware.graphics.common@1.0", + "android.hardware.graphics.mapper@2.0", + "libgrallocusage", ], }