Merge "Move definition of configureRpcThreadpool."
diff --git a/transport/HidlBinderSupport.cpp b/transport/HidlBinderSupport.cpp
index de4519b..30c2323 100644
--- a/transport/HidlBinderSupport.cpp
+++ b/transport/HidlBinderSupport.cpp
@@ -185,5 +185,13 @@
     return status;
 }
 
+void configureBinderRpcThreadpool(size_t maxThreads, bool callerWillJoin) {
+    ProcessState::self()->setThreadPoolConfiguration(maxThreads, callerWillJoin /*callerJoinsPool*/);
+}
+
+void joinBinderRpcThreadpool() {
+    IPCThreadState::self()->joinThreadPool();
+}
+
 }  // namespace hardware
 }  // namespace android
diff --git a/transport/include/hidl/HidlBinderSupport.h b/transport/include/hidl/HidlBinderSupport.h
index 2fff6cb..e948221 100644
--- a/transport/include/hidl/HidlBinderSupport.h
+++ b/transport/include/hidl/HidlBinderSupport.h
@@ -356,13 +356,8 @@
     }
 }
 
-inline void configureBinderRpcThreadpool(size_t maxThreads, bool callerWillJoin) {
-    ProcessState::self()->setThreadPoolConfiguration(maxThreads, callerWillJoin /*callerJoinsPool*/);
-}
-
-inline void joinBinderRpcThreadpool() {
-    IPCThreadState::self()->joinThreadPool();
-}
+void configureBinderRpcThreadpool(size_t maxThreads, bool callerWillJoin);
+void joinBinderRpcThreadpool();
 
 }  // namespace hardware
 }  // namespace android