commit ed1f3ddbe13fed1d5fedd5dfcdb6912bc40ee68d
author Martijn Coenen <maco@google.com> Mon Nov 27 15:28:54 2017 -0800
committer Steven Moreland <smoreland@google.com> Thu Dec 07 01:29:43 2017 +0000
tree 14ea0f7c0f861fd0153c9836ee3a7f443de24b14
parent 1e04497ba90b8e8adcfd166948659c9110286d2c

Remove dependencies on libhwbinder.

Bug: 34388964
Test: wifi works
Change-Id: I001e2da21d173fada2ad7f78c76e89227cbe37cc

Android.mk

diff --git a/Android.mk b/Android.mk
index 5a5a078..f745285 100644
--- a/Android.mk
+++ b/Android.mk
@@ -35,7 +35,6 @@
     libbase \
     libcutils \
     libhidlbase \
-    libhwbinder \
     libhidltransport \
     libminijail \
     libutils \
@@ -79,7 +78,6 @@
     libbase \
     libutils \
     libhidlbase \
-    libhwbinder \
     libhidltransport \
     libwifi-system \
     libwifi-system-iface
@@ -203,7 +201,6 @@
     libcutils \
     libhidltransport \
     libhidlbase \
-    libhwbinder \
     liblog \
     libutils \
     libwifi-system \

main.cpp

diff --git a/main.cpp b/main.cpp
index 50e8d67..488447c 100644
--- a/main.cpp
+++ b/main.cpp
@@ -26,8 +26,7 @@
 #include <binder/IServiceManager.h>
 #include <binder/ProcessState.h>
 #include <cutils/properties.h>
-#include <hwbinder/IPCThreadState.h>
-#include <hwbinder/ProcessState.h>
+#include <hidl/HidlTransportSupport.h>
 #include <libminijail.h>
 #include <utils/String16.h>
 #include <wifi_system/interface_tool.h>
@@ -93,10 +92,8 @@
 
 // Setup our interface to the hw Binder driver or die trying.
 int SetupHwBinderOrCrash() {
-  int binder_fd = -1;
-  android::hardware::ProcessState::self()->setThreadPoolConfiguration(1, true);
-  int err = android::hardware::IPCThreadState::self()->setupPolling(&binder_fd);
-  CHECK_EQ(err, 0) << "Error setting up hw binder polling: " << strerror(-err);
+  android::hardware::configureRpcThreadpool(1, true /* callerWillJoin */);
+  int binder_fd  = android::hardware::setupTransportPolling();
   CHECK_GE(binder_fd, 0) << "Invalid hw binder FD: " << binder_fd;
   return binder_fd;
 }
@@ -116,7 +113,7 @@
 }
 
 void OnHwBinderReadReady(int fd) {
-  android::hardware::IPCThreadState::self()->handlePolledCommands();
+  android::hardware::handleTransportPoll(fd);
 }
 
 int main(int argc, char** argv) {