diff options
Diffstat (limited to 'libs/binder/ProcessState.cpp')
| -rw-r--r-- | libs/binder/ProcessState.cpp | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/libs/binder/ProcessState.cpp b/libs/binder/ProcessState.cpp index 86afffc079..3798b61ab9 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 @@ sp<ProcessState> ProcessState::self() if (gProcess != nullptr) { return gProcess; } - gProcess = new ProcessState(getDefaultBinderDriver()); + gProcess = new ProcessState(kDefaultDriver); return gProcess; } |