commit 38a78e1fa9c6ee330c5db33d220b0f6bffa7b265
author Zhuoyao Zhang <zhuoyao@google.com> Tue Oct 10 17:53:09 2017 -0700
committer Steven Moreland <smoreland@google.com> Thu Oct 12 15:47:39 2017 -0700
tree 8d7aac8bce06b1c663462259a6723b679aba2e74
parent dbdd88124042f2bc592e912941595341be4047e7

Static link test lib shims with test -impl libs.

* So that vts no longer needs to push the shim libs in hidl test.

Bug: 67500459
Test: make vts
      vts-tradefed run vts -m VtsHidlUnitTest
Change-Id: I52ad066370f08a461b848d7d96dc4a659eb2da4d

tests/baz/1.0/default/Android.bp

diff --git a/tests/baz/1.0/default/Android.bp b/tests/baz/1.0/default/Android.bp
index f247b83..492e0b4 100644
--- a/tests/baz/1.0/default/Android.bp
+++ b/tests/baz/1.0/default/Android.bp
@@ -1,4 +1,4 @@
-cc_library_shared {
+cc_library {
     name: "android.hardware.tests.baz@1.0-impl",
     defaults: ["hidl_defaults"],
     relative_install_path: "hw",
@@ -7,9 +7,15 @@
     ],
     shared_libs: [
         "libbase",
+        "libcutils",
         "libhidlbase",
         "libhidltransport",
+        "libhwbinder",
+        "liblog",
         "libutils",
-        "android.hardware.tests.baz@1.0",
     ],
+
+    // These are static libs only for testing purposes and portability. Shared
+    // libs should be used on device.
+    static_libs: ["android.hardware.tests.baz@1.0"],
 }