Merge "Revert "libbinder: Choose the binder driver at runtime based on system/vendor process.""
am: 1f69a63dda
Change-Id: Idcd26a40071e8a81d9d89edb275d61a159d205aa
diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp
index 5aa8849..da10687 100644
--- a/libs/binder/Android.bp
+++ b/libs/binder/Android.bp
@@ -120,7 +120,6 @@
"libcutils",
"libutils",
"libbinderthreadstate",
- "libvndksupport",
],
header_libs: [
diff --git a/libs/binder/ProcessState.cpp b/libs/binder/ProcessState.cpp
index 86afffc..3798b61 100644
--- a/libs/binder/ProcessState.cpp
+++ b/libs/binder/ProcessState.cpp
@@ -26,7 +26,6 @@
#include <utils/String8.h>
#include <utils/String8.h>
#include <utils/threads.h>
-#include <vndksupport/linker.h>
#include <private/binder/binder_module.h>
#include <private/binder/Static.h>
@@ -44,22 +43,16 @@
#define BINDER_VM_SIZE ((1 * 1024 * 1024) - sysconf(_SC_PAGE_SIZE) * 2)
#define DEFAULT_MAX_BINDER_THREADS 15
-const char* kDefaultVendorDriver = "/dev/vndbinder";
+#ifdef __ANDROID_VNDK__
+const char* kDefaultDriver = "/dev/vndbinder";
+#else
const char* kDefaultDriver = "/dev/binder";
+#endif
// -------------------------------------------------------------------------
namespace android {
-static const char *getDefaultBinderDriver() {
- // Some libs might have their system variants loaded in a vendor process, so
- // we cannot depend on a compile time check.
- if (android_is_in_vendor_process()) {
- return kDefaultVendorDriver;
- }
- return kDefaultDriver;
-}
-
class PoolThread : public Thread
{
public:
@@ -84,7 +77,7 @@
if (gProcess != nullptr) {
return gProcess;
}
- gProcess = new ProcessState(getDefaultBinderDriver());
+ gProcess = new ProcessState(kDefaultDriver);
return gProcess;
}