commit 0baba59b100ba6a341d0fa988c0ccad8d803673a
author Steven Moreland <smoreland@google.com> Mon Aug 12 17:52:54 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Aug 12 17:52:54 2024 +0000
tree 4063d9ef4f71b0f0b3d6e85f6c3140cfc00190a6
parent c36f1c10185f0d4c3cb7c5053fd1f2f30829e92e
parent 576662ab0698b3189b2e7cd5eecb5526ceead93e

Merge "libbinder: allow libbinder_ndk + libbinder.vendor" into main

libs/binder/IServiceManager.cpp

diff --git a/libs/binder/IServiceManager.cpp b/libs/binder/IServiceManager.cpp
index 8b80aed..333f956 100644
--- a/libs/binder/IServiceManager.cpp
+++ b/libs/binder/IServiceManager.cpp
@@ -253,8 +253,11 @@
     }
 }
 
+#endif //__ANDROID_VNDK__
+
 void* openDeclaredPassthroughHal(const String16& interface, const String16& instance, int flag) {
-#if defined(__ANDROID__) && !defined(__ANDROID_RECOVERY__) && !defined(__ANDROID_NATIVE_BRIDGE__)
+#if defined(__ANDROID__) && !defined(__ANDROID_VENDOR__) && !defined(__ANDROID_RECOVERY__) && \
+        !defined(__ANDROID_NATIVE_BRIDGE__)
     sp<IServiceManager> sm = defaultServiceManager();
     String16 name = interface + String16("/") + instance;
     if (!sm->isDeclared(name)) {
@@ -274,8 +277,6 @@
 #endif
 }
 
-#endif //__ANDROID_VNDK__
-
 // ----------------------------------------------------------------------
 
 ServiceManagerShim::ServiceManagerShim(const sp<AidlServiceManager>& impl) {