From eb8dfd8c01f86844e3cc303fdf319a91b2da924a Mon Sep 17 00:00:00 2001 From: Tri Vo Date: Fri, 4 Aug 2017 15:27:06 -0700 Subject: [PATCH] Audio test statically links to dependencies. This test now statically links to libs not guaranteed to be on the device. Bug: 64040096 Test: vts-tradefed run commandAndExit vts --skip-all-system-status-check --primary-abi-only --skip-preconditions --module VtsHalAudioEffectV2_0Target Test: vts-tradefed run commandAndExit vts --skip-all-system-status-check --primary-abi-only --skip-preconditions --module VtsHalAudioV2_0Target Change-Id: I331d7e4abdf7e520df6d508a8059b6358ad4398f --- audio/2.0/vts/functional/Android.bp | 29 +++++++-------------- audio/effect/2.0/vts/functional/Android.bp | 30 ++++++++-------------- 2 files changed, 19 insertions(+), 40 deletions(-) diff --git a/audio/2.0/vts/functional/Android.bp b/audio/2.0/vts/functional/Android.bp index b289709fda..f3b2ca72cd 100644 --- a/audio/2.0/vts/functional/Android.bp +++ b/audio/2.0/vts/functional/Android.bp @@ -16,29 +16,18 @@ cc_test { name: "VtsHalAudioV2_0TargetTest", - defaults: ["hidl_defaults"], - srcs: ["AudioPrimaryHidlHalTest.cpp", - "ValidateAudioConfiguration.cpp"], - shared_libs: [ - "libbase", - "liblog", - "libhidlbase", - "libhidltransport", - "libutils", - "libcutils", - "libxml2", - "android.hardware.audio@2.0", - "android.hardware.audio.common@2.0", + defaults: ["VtsHalTargetTestDefaults"], + srcs: [ + "AudioPrimaryHidlHalTest.cpp", + "ValidateAudioConfiguration.cpp" ], static_libs: [ - "VtsHalHidlTargetTestBase", "android.hardware.audio.common.test.utility", + "android.hardware.audio@2.0", + "android.hardware.audio.common@2.0", + "libxml2", ], - cflags: [ - "-O0", - "-g", - "-Wall", - "-Wextra", - "-Werror", + shared_libs: [ + "libicuuc", ], } diff --git a/audio/effect/2.0/vts/functional/Android.bp b/audio/effect/2.0/vts/functional/Android.bp index 15f1e645c7..7b421cb7e7 100644 --- a/audio/effect/2.0/vts/functional/Android.bp +++ b/audio/effect/2.0/vts/functional/Android.bp @@ -16,30 +16,20 @@ cc_test { name: "VtsHalAudioEffectV2_0TargetTest", - defaults: ["hidl_defaults"], - srcs: ["VtsHalAudioEffectV2_0TargetTest.cpp", - "ValidateAudioEffectsConfiguration.cpp"], - shared_libs: [ - "libbase", - "liblog", - "libcutils", - "libhidlbase", - "libhidltransport", - "libnativehelper", - "libutils", - "libxml2", + defaults: ["VtsHalTargetTestDefaults"], + srcs: [ + "VtsHalAudioEffectV2_0TargetTest.cpp", + "ValidateAudioEffectsConfiguration.cpp" + ], + static_libs: [ + "android.hardware.audio.common.test.utility", "android.hardware.audio.common@2.0", "android.hardware.audio.effect@2.0", "android.hidl.allocator@1.0", "android.hidl.memory@1.0", + "libxml2", ], - static_libs: [ - "VtsHalHidlTargetTestBase", - "android.hardware.audio.common.test.utility", - ], - cflags: [ - "-O0", - "-g", - "-Wextra", + shared_libs: [ + "libicuuc", ], }