From 1b228f4fd5b68f919b245024c35ebd3aef52bb9f Mon Sep 17 00:00:00 2001 From: Jooyung Han Date: Thu, 30 Jan 2020 13:41:12 +0900 Subject: Cleanup: remove VNDK APEX exception from binder VNDK APEX is now built with vendor variants instead of apex variants. Now, no need to whitelist vndk apex in libbinder's apex_available or use __ANDROID_APEX_COM_ANDROID_VNDK_CURRENT__ for stability check. Bug: 146758869 Test: m / flash / device boots Change-Id: I008b063fd2a480ca754d89ffe3b9be0db969f7a1 --- libs/binder/ProcessState.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'libs/binder/ProcessState.cpp') diff --git a/libs/binder/ProcessState.cpp b/libs/binder/ProcessState.cpp index ce2cd9969f..c0f5e31d72 100644 --- a/libs/binder/ProcessState.cpp +++ b/libs/binder/ProcessState.cpp @@ -60,14 +60,14 @@ public: : mIsMain(isMain) { } - + protected: virtual bool threadLoop() { IPCThreadState::self()->joinThreadPool(mIsMain); return false; } - + const bool mIsMain; }; @@ -296,7 +296,7 @@ sp ProcessState::getStrongProxyForHandle(int32_t handle) void ProcessState::expungeHandle(int32_t handle, IBinder* binder) { AutoMutex _l(mLock); - + handle_entry* e = lookupHandleLocked(handle); // This handle may have already been replaced with a new BpBinder @@ -387,7 +387,7 @@ ProcessState::ProcessState(const char *driver) { // TODO(b/139016109): enforce in build system -#if defined(__ANDROID_APEX__) && !defined(__ANDROID_APEX_COM_ANDROID_VNDK_CURRENT__) +#if defined(__ANDROID_APEX__) LOG_ALWAYS_FATAL("Cannot use libbinder in APEX (only system.img libbinder) since it is not stable."); #endif @@ -416,5 +416,5 @@ ProcessState::~ProcessState() } mDriverFD = -1; } - + } // namespace android -- cgit v1.2.3-59-g8ed1b