commit 6013a3ce9672869f4eb5cc7f9d447be40ca24960
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jul 20 16:20:59 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 20 16:20:59 2017 +0000
tree 9976350b376bc24f6e69cde854f32618931f187e
parent 4d6d31b221f9e268c154df574bfd851d4f5c9ced
parent 921d12ea6d212e97a7bce124850ec914eebaa02d

Merge "Audio VTS: Change test utility from dyn to static lib"

audio/2.0/vts/functional/Android.bp

diff --git a/audio/2.0/vts/functional/Android.bp b/audio/2.0/vts/functional/Android.bp
index daae738..b289709 100644
--- a/audio/2.0/vts/functional/Android.bp
+++ b/audio/2.0/vts/functional/Android.bp
@@ -29,9 +29,11 @@
         "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",

audio/common/test/utility/Android.bp

diff --git a/audio/common/test/utility/Android.bp b/audio/common/test/utility/Android.bp
index cca56f6..b796acc 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"],

audio/effect/2.0/vts/functional/Android.bp

diff --git a/audio/effect/2.0/vts/functional/Android.bp b/audio/effect/2.0/vts/functional/Android.bp
index b3002a4..15f1e64 100644
--- a/audio/effect/2.0/vts/functional/Android.bp
+++ b/audio/effect/2.0/vts/functional/Android.bp
@@ -29,12 +29,14 @@
         "libutils",
         "libxml2",
         "android.hardware.audio.common@2.0",
-        "android.hardware.audio.common.test.utility",
         "android.hardware.audio.effect@2.0",
         "android.hidl.allocator@1.0",
         "android.hidl.memory@1.0",
     ],
-    static_libs: ["VtsHalHidlTargetTestBase"],
+    static_libs: [
+        "VtsHalHidlTargetTestBase",
+        "android.hardware.audio.common.test.utility",
+    ],
     cflags: [
         "-O0",
         "-g",