diff options
| author | Martijn Coenen <maco@google.com> | 2019-03-13 11:53:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-03-13 11:53:54 +0000 |
| commit | 1f69a63dda1306f046c3b6c3ddb29770979944c7 (patch) | |
| tree | 54acf828ea0d44b8e87fd1cf5d4bc10b165ebfe2 | |
| parent | 873f49999447c705dac1e1c7537d0a9bdf4d27c0 (diff) | |
| parent | 7bca77a21bc202621ab60a3599b2cf8a30ef81e2 (diff) | |
| download | native-android-o-mr1-iot-release-1.0.10.tar.gz | |
Merge "Revert "libbinder: Choose the binder driver at runtime based on system/vendor process.""android-q-preview-1android-o-mr1-iot-release-1.0.10
| -rw-r--r-- | libs/binder/Android.bp | 1 | ||||
| -rw-r--r-- | libs/binder/ProcessState.cpp | 17 |
2 files changed, 5 insertions, 13 deletions
diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp index 5aa8849017..da10687476 100644 --- a/libs/binder/Android.bp +++ b/libs/binder/Android.bp @@ -120,7 +120,6 @@ cc_library_shared { "libcutils", "libutils", "libbinderthreadstate", - "libvndksupport", ], header_libs: [ 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; } |