commit 39ca6b7cc3afad0ace05ce4dbfd56d27ec6e3442
author Devin Moore <devinmoore@google.com> Wed May 31 23:31:19 2023 +0000
committer Devin Moore <devinmoore@google.com> Tue Jun 20 22:39:11 2023 +0000
tree a7d3efdd51ec34b0a26a4e936f2e1fdfab596cbd
parent adbf9a543f5d1da50fdd4bf8bee1ceb8477c758d

hwservicemanager and the allocator are moved to system_ext

We want to remove these by default from Android U+ devices and still
allow some devices to add them back. So they are moved to system_ext.

Test: m && launch_cvd # check for hwservicemanager running
Bug: 218588089

Change-Id: Ia6f7b41a7b37057518a28aea1ec43e3f87e7fa30

transport/ServiceManagement.cpp

diff --git a/transport/ServiceManagement.cpp b/transport/ServiceManagement.cpp
index 637e74b..a5ad23e 100644
--- a/transport/ServiceManagement.cpp
+++ b/transport/ServiceManagement.cpp
@@ -210,7 +210,8 @@
            fqName == IServiceManager1_2::descriptor;
 }
 static bool isHwServiceManagerInstalled() {
-    return access("/system/bin/hwservicemanager", F_OK) == 0;
+    return access("/system_ext/bin/hwservicemanager", F_OK) == 0 ||
+           access("/system/system_ext/bin/hwservicemanager", F_OK) == 0;
 }
 
 /*