From 07183337659ae3e9e6eb55dbcc442a030fc6eee5 Mon Sep 17 00:00:00 2001 From: Kevin Rocard Date: Tue, 18 Jul 2017 12:29:39 -0700 Subject: [PATCH] Audio VTS: Change test utility from dyn to static lib Bug: 63801053 In order to avoid having to instruct vts-tradefed to push the test utility library on the target before runing the audio VTS, duplicating the makefile declaration, make the library static. Test: make vts Test: vts-tradefed run commandAndExit vts --module VtsHalAudioV2_0Target Change-Id: I7a98b2aaf0e0f6f91a92b7f01df1c630540ad697 Merged-In: I7a98b2aaf0e0f6f91a92b7f01df1c630540ad697 Signed-off-by: Kevin Rocard --- audio/2.0/vts/functional/Android.bp | 4 +++- audio/common/test/utility/Android.bp | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/audio/2.0/vts/functional/Android.bp b/audio/2.0/vts/functional/Android.bp index daae7388ea..b289709fda 100644 --- a/audio/2.0/vts/functional/Android.bp +++ b/audio/2.0/vts/functional/Android.bp @@ -29,9 +29,11 @@ cc_test { "libxml2", "android.hardware.audio@2.0", "android.hardware.audio.common@2.0", + ], + static_libs: [ + "VtsHalHidlTargetTestBase", "android.hardware.audio.common.test.utility", ], - static_libs: ["VtsHalHidlTargetTestBase"], cflags: [ "-O0", "-g", diff --git a/audio/common/test/utility/Android.bp b/audio/common/test/utility/Android.bp index cca56f6b6f..b796acc73e 100644 --- a/audio/common/test/utility/Android.bp +++ b/audio/common/test/utility/Android.bp @@ -14,7 +14,7 @@ // limitations under the License. // -cc_library_shared { +cc_library_static { name: "android.hardware.audio.common.test.utility", defaults : ["hidl_defaults"], srcs: ["src/ValidateXml.cpp"],