Merge "make Return<T> non-copyable."
diff --git a/base/HidlInternal.cpp b/base/HidlInternal.cpp
index 9c0efbb..4f88be5 100644
--- a/base/HidlInternal.cpp
+++ b/base/HidlInternal.cpp
@@ -129,6 +129,7 @@
}
#else
// No-op for user builds.
+ (void) instrumentationCallbacks;
return;
#endif
}
@@ -139,6 +140,8 @@
std::cmatch cm;
std::regex e("^" + mInstrumentationLibPackage + "(.*).profiler.so$");
if (std::regex_match(file->d_name, cm, e)) return true;
+#else
+ (void) file;
#endif
return false;
}
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
diff --git a/transport/include/hidl/Static.h b/transport/include/hidl/Static.h
index d62d675..04b1729 100644
--- a/transport/include/hidl/Static.h
+++ b/transport/include/hidl/Static.h
@@ -21,7 +21,8 @@
#include <android/hidl/manager/1.0/IServiceManager.h>
#include <hidl/ConcurrentMap.h>
#include <hwbinder/IBinder.h>
-#include <utils/threads.h>
+#include <utils/StrongPointer.h>
+#include <utils/Mutex.h>
namespace android {
namespace hardware {