diff options
| author | 2025-01-28 09:43:24 -0800 | |
|---|---|---|
| committer | 2025-01-28 09:43:24 -0800 | |
| commit | 3001fd617e795e68f67faae4151cf55012d411af (patch) | |
| tree | ec9dbeeeab39eac5b4d556b0776546084a0cb2a0 /libs/binder/IServiceManager.cpp | |
| parent | 6eb2718241451ca25517421fb7b0bc6a3e388b4c (diff) | |
| parent | fcfe0409916dcd9b9b6bf66c7dda3446a994bc2e (diff) | |
Merge "Enable compilation of libbinder on Fuchsia" into main am: 7317ccbb67 am: fcfe040991
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3459704
Change-Id: I7af7ff3260fcb5b8e05a1897ad1e537d34ccdc06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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. |