commit 348563a64237f63f1a470b1e1fd1ebe22732b692
author Steven Moreland <smoreland@google.com> Wed Jun 19 13:53:19 2019 -0700
committer Steven Moreland <smoreland@google.com> Fri Sep 06 17:18:55 2019 -0700
tree 45197e11030d9522c35fa80a2ab715460b37fd2d
parent f0dd160cbe7c80204a2e361896f677a2bd12863f

Restore libhidl_test Android.bp

Statically including these libs is nice, but it is causing conflicts
when libhwbinder is combined into libhidlbase. Undoing this for now.

Bug: 134961554
Test: TH/local build
Change-Id: If089145adf12ee9d077bfe1616404080a5dc11b9
Merged-In: If089145adf12ee9d077bfe1616404080a5dc11b9

Android.bp

diff --git a/Android.bp b/Android.bp
index 7b4412a..29f9b56 100644
--- a/Android.bp
+++ b/Android.bp
@@ -44,15 +44,12 @@
     shared_libs: [
         "android.hidl.memory@1.0",
         "libbase",
+        "libhidlbase",
+        "liblog",
         "libutils",
         "libcutils",
-        "libvndksupport",
     ],
-    static_libs: [
-        "libhidlbase",
-        "libgtest",
-        "libgmock"
-    ],
+    static_libs: ["libgtest", "libgmock"],
 
     cflags: [
         "-O0",