commit bddd38c571e1db7f534ce157db120855ae513f0c
author Pawin Vongmasa <pawin@google.com> Thu Jan 31 05:23:01 2019 -0800
committer Pawin Vongmasa <pawin@google.com> Thu Feb 14 16:11:44 2019 -0800
tree fe4569113a85d7509c2f33a955f5868ca03a3f4b
parent a7d9925836c1ba5a75f0242c900fb3c0953f41dc

Allow multiple H2B converters in one HpInterface

Changes in this CL:
- Remove one argument from IMPLEMENT_HYBRID_META_INTERFACE and
  H2BConverter.
- Revise H2BConverter and HpInterface to allow multiple H2B converters
  in one HpInterface.
- Update the documentation.

Test: make cts -j123 && cts-tradefed run cts-dev -m \
CtsMediaTestCases --compatibility:module-arg \
CtsMediaTestCases:include-annotation:\
android.platform.test.annotations.RequiresDevice

Bug: 111902308

Change-Id: I3d4ec9b018134d3ad4d42c9ee5450c6c1228538d

transport/token/1.0/utils/Android.bp

diff --git a/transport/token/1.0/utils/Android.bp b/transport/token/1.0/utils/Android.bp
index 5a8d51c..cdbdd97 100644
--- a/transport/token/1.0/utils/Android.bp
+++ b/transport/token/1.0/utils/Android.bp
@@ -25,22 +25,16 @@
         "HybridInterface.cpp",
     ],
 
-    header_libs: [
-        "libbinder_headers",
-    ],
-
     shared_libs: [
-        "libutils",
-        "liblog",
-        "libhidlbase",
         "android.hidl.token@1.0",
-    ],
-
-    export_header_lib_headers: [
-        "libbinder_headers",
+        "libbinder",
+        "libhidlbase",
+        "liblog",
+        "libutils",
     ],
 
     export_shared_lib_headers: [
+        "libbinder",
         "libhidlbase",
     ],