diff options
author | 2022-11-23 13:23:42 +0100 | |
---|---|---|
committer | 2025-01-28 08:44:35 -0800 | |
commit | e8e12433e1f7628904311347f9aeb455c2cb0a4f (patch) | |
tree | 837559914fccc608780266d517c8045d8c482e74 /libs/binder/IServiceManager.cpp | |
parent | a5f7d9f7b8db227c0d72664394513ed58fe38b59 (diff) |
Enable compilation of libbinder on Fuchsia
This ensures that getMinSchedulerPolicy and getMinSchedulerPriority are
only called on Linux as they are only defined here.
This replaces some __ANDROID__ ifdef's with BINDER_WITH_KERNEL_IPC.
Change-Id: Idec83bf1715ac3c62ac7a849aa188aa491a19fda
Diffstat (limited to 'libs/binder/IServiceManager.cpp')
-rw-r--r-- | libs/binder/IServiceManager.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libs/binder/IServiceManager.cpp b/libs/binder/IServiceManager.cpp index 719e445794..c9ca646472 100644 --- a/libs/binder/IServiceManager.cpp +++ b/libs/binder/IServiceManager.cpp @@ -43,7 +43,11 @@ #include <binder/IPermissionController.h> #endif -#ifdef __ANDROID__ +#if !(defined(__ANDROID__) || defined(__FUCHSIA)) +#define BINDER_SERVICEMANAGEMENT_DELEGATION_SUPPORT +#endif + +#if !defined(BINDER_SERVICEMANAGEMENT_DELEGATION_SUPPORT) #include <cutils/properties.h> #else #include "ServiceManagerHost.h" @@ -902,7 +906,7 @@ std::vector<IServiceManager::ServiceDebugInfo> CppBackendShim::getServiceDebugIn return ret; } -#ifndef __ANDROID__ +#if defined(BINDER_SERVICEMANAGEMENT_DELEGATION_SUPPORT) // CppBackendShim for host. Implements the old libbinder android::IServiceManager API. // The internal implementation of the AIDL interface android::os::IServiceManager calls into // on-device service manager. |