commit fe25f12be72212333ab35ee3c62b155d2f557077
author Tomasz Wasilczyk <twasilczyk@google.com> Wed Jun 26 12:45:57 2024 -0700
committer Tomasz Wasilczyk <twasilczyk@google.com> Fri Jun 28 14:45:40 2024 +0000
tree d0a27801bb8ca89e20646aca06cc180334ef4b0f
parent 8a56df6825b5042503d74d690071c4bca9db91f2

BackendUnifiedServiceManager: tidy up includes

This was breaking Linux Binder IPC (WIP) build.

Bug: 341997808
Test: mma
Change-Id: Ic3f25c9c49773d4f7c759e8318513f166ec2d995

libs/binder/BackendUnifiedServiceManager.cpp

diff --git a/libs/binder/BackendUnifiedServiceManager.cpp b/libs/binder/BackendUnifiedServiceManager.cpp
index 496c5ef..b0d3048 100644
--- a/libs/binder/BackendUnifiedServiceManager.cpp
+++ b/libs/binder/BackendUnifiedServiceManager.cpp
@@ -15,6 +15,10 @@
  */
 #include "BackendUnifiedServiceManager.h"
 
+#if defined(__BIONIC__) && !defined(__ANDROID_VNDK__)
+#include <android-base/properties.h>
+#endif
+
 namespace android {
 
 using AidlServiceManager = android::os::IServiceManager;

libs/binder/BackendUnifiedServiceManager.h

diff --git a/libs/binder/BackendUnifiedServiceManager.h b/libs/binder/BackendUnifiedServiceManager.h
index a67d5ba..d72b5bb 100644
--- a/libs/binder/BackendUnifiedServiceManager.h
+++ b/libs/binder/BackendUnifiedServiceManager.h
@@ -15,7 +15,6 @@
  */
 #pragma once
 
-#include <android-base/properties.h>
 #include <android/os/BnServiceManager.h>
 #include <android/os/IServiceManager.h>
 #include <binder/IPCThreadState.h>

libs/binder/IServiceManager.cpp

diff --git a/libs/binder/IServiceManager.cpp b/libs/binder/IServiceManager.cpp
index 50d00ae..2095586 100644
--- a/libs/binder/IServiceManager.cpp
+++ b/libs/binder/IServiceManager.cpp
@@ -16,8 +16,8 @@
 
 #define LOG_TAG "ServiceManagerCppClient"
 
-#include <BackendUnifiedServiceManager.h>
 #include <binder/IServiceManager.h>
+#include "BackendUnifiedServiceManager.h"
 
 #include <inttypes.h>
 #include <unistd.h>