commit 1fe487ccea48abb67b9e6ec4f8a94791bd7daa64
author Yifan Hong <elsk@google.com> Thu Dec 03 20:39:21 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Dec 03 20:39:21 2020 +0000
tree cdd6793324f3fbfe5b6e4dc083f4e6a4bcf288ff
parent 19f051ee8308a5140372d88f24c89efdc0792fde
parent 96543bb1a5bfb570f28a7e3e4e2440e0a96c9bef

Merge "lshal_test uses static libvintf." am: 9e4245bd22 am: 96543bb1a5

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1515339

Change-Id: Iee4c3ae3f0d9134dfa8998e70a0fb2bd204cfb6b

cmds/lshal/Android.bp

diff --git a/cmds/lshal/Android.bp b/cmds/lshal/Android.bp
index 987adaf..1994e56 100644
--- a/cmds/lshal/Android.bp
+++ b/cmds/lshal/Android.bp
@@ -72,15 +72,18 @@
 cc_test {
     name: "lshal_test",
     test_suites: ["device-tests"],
-    defaults: ["lshal_defaults"],
+    defaults: [
+        "libvintf_static_user_defaults",
+        "lshal_defaults"
+    ],
     gtest: true,
     static_libs: [
         "android.hardware.tests.inheritance@1.0",
         "libgmock",
+        "libvintf",
     ],
     shared_libs: [
         "libhidlbase",
-        "libvintf",
     ],
     srcs: [
         "test.cpp"