Merge "RpcServer: let system allocate vsock ports" into main
diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp
index 1c8aa37..1abde5c 100644
--- a/libs/binder/Android.bp
+++ b/libs/binder/Android.bp
@@ -268,21 +268,6 @@
"-DANDROID_BASE_UNIQUE_FD_DISABLE_IMPLICIT_CONVERSION",
"-DANDROID_UTILS_REF_BASE_DISABLE_IMPLICIT_CONSTRUCTION",
],
-
- target: {
- bionic: {
- // Hide symbols by default and set the BUILDING_LIBBINDER macro so that
- // the code knows to export them.
- //
- // Only enabled on bionic builds, where RTTI is disabled, because
- // it is failing to export required typeinfo symbols.
- // TODO: b/341341056 - Find a solution for non-bionic builds.
- cflags: [
- "-fvisibility=hidden",
- "-DBUILDING_LIBBINDER",
- ],
- },
- },
}
cc_defaults {
diff --git a/libs/binder/BackendUnifiedServiceManager.cpp b/libs/binder/BackendUnifiedServiceManager.cpp
index 496c5ef..b0d3048 100644
--- a/libs/binder/BackendUnifiedServiceManager.cpp
+++ b/libs/binder/BackendUnifiedServiceManager.cpp
@@ -15,6 +15,10 @@
*/
#include "BackendUnifiedServiceManager.h"
+#if defined(__BIONIC__) && !defined(__ANDROID_VNDK__)
+#include <android-base/properties.h>
+#endif
+
namespace android {
using AidlServiceManager = android::os::IServiceManager;
diff --git a/libs/binder/BackendUnifiedServiceManager.h b/libs/binder/BackendUnifiedServiceManager.h
index a67d5ba..d72b5bb 100644
--- a/libs/binder/BackendUnifiedServiceManager.h
+++ b/libs/binder/BackendUnifiedServiceManager.h
@@ -15,7 +15,6 @@
*/
#pragma once
-#include <android-base/properties.h>
#include <android/os/BnServiceManager.h>
#include <android/os/IServiceManager.h>
#include <binder/IPCThreadState.h>
diff --git a/libs/binder/IServiceManager.cpp b/libs/binder/IServiceManager.cpp
index 50d00ae..2095586 100644
--- a/libs/binder/IServiceManager.cpp
+++ b/libs/binder/IServiceManager.cpp
@@ -16,8 +16,8 @@
#define LOG_TAG "ServiceManagerCppClient"
-#include <BackendUnifiedServiceManager.h>
#include <binder/IServiceManager.h>
+#include "BackendUnifiedServiceManager.h"
#include <inttypes.h>
#include <unistd.h>
diff --git a/libs/binder/include/binder/Functional.h b/libs/binder/include/binder/Functional.h
index 08e3b21..bb0e5f4 100644
--- a/libs/binder/include/binder/Functional.h
+++ b/libs/binder/include/binder/Functional.h
@@ -17,11 +17,38 @@
#pragma once
#include <functional>
-#include <memory>
+#include <optional>
namespace android::binder::impl {
template <typename F>
+class scope_guard;
+
+template <typename F>
+scope_guard<F> make_scope_guard(F f);
+
+template <typename F>
+class scope_guard {
+public:
+ inline ~scope_guard() {
+ if (f_.has_value()) std::move(f_.value())();
+ }
+ inline void release() { f_.reset(); }
+
+private:
+ friend scope_guard<F> android::binder::impl::make_scope_guard(F);
+
+ inline scope_guard(F&& f) : f_(std::move(f)) {}
+
+ std::optional<F> f_;
+};
+
+template <typename F>
+inline scope_guard<F> make_scope_guard(F f) {
+ return scope_guard<F>(std::move(f));
+}
+
+template <typename F>
constexpr void assert_small_callable() {
// While this buffer (std::function::__func::__buf_) is an implementation detail generally not
// accessible to users, it's a good bet to assume its size to be around 3 pointers.
@@ -32,12 +59,6 @@
"Try using std::ref, but make sure lambda lives long enough to be called.");
}
-template <typename F>
-std::unique_ptr<void, std::function<void(void*)>> make_scope_guard(F&& f) {
- assert_small_callable<decltype(std::bind(f))>();
- return {reinterpret_cast<void*>(true), std::bind(f)};
-}
-
template <typename T>
class SmallFunction : public std::function<T> {
public:
diff --git a/libs/binder/ndk/tests/libbinder_ndk_unit_test.cpp b/libs/binder/ndk/tests/libbinder_ndk_unit_test.cpp
index 966ec95..666b3af 100644
--- a/libs/binder/ndk/tests/libbinder_ndk_unit_test.cpp
+++ b/libs/binder/ndk/tests/libbinder_ndk_unit_test.cpp
@@ -826,22 +826,22 @@
class MyResultReceiver : public BnResultReceiver {
public:
- Mutex mMutex;
- Condition mCondition;
+ std::mutex mMutex;
+ std::condition_variable mCondition;
bool mHaveResult = false;
int32_t mResult = 0;
virtual void send(int32_t resultCode) {
- AutoMutex _l(mMutex);
+ std::unique_lock<std::mutex> _l(mMutex);
mResult = resultCode;
mHaveResult = true;
- mCondition.signal();
+ mCondition.notify_one();
}
int32_t waitForResult() {
- AutoMutex _l(mMutex);
+ std::unique_lock<std::mutex> _l(mMutex);
while (!mHaveResult) {
- mCondition.wait(mMutex);
+ mCondition.wait(_l);
}
return mResult;
}